From 8a8aeffdb3d2e5b01eac8243a6632b47d708331d Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 3 Nov 2019 19:34:00 +0000
Subject: [PATCH] Players with no mastery can only have one cubic.

---
 .../data/scripts/handlers/effecthandlers/SummonCubic.java  | 7 ++++---
 .../data/scripts/handlers/effecthandlers/SummonCubic.java  | 7 ++++---
 .../data/scripts/handlers/effecthandlers/SummonCubic.java  | 7 ++++---
 .../data/scripts/handlers/effecthandlers/SummonCubic.java  | 7 ++++---
 .../data/scripts/handlers/effecthandlers/SummonCubic.java  | 7 ++++---
 .../data/scripts/handlers/effecthandlers/SummonCubic.java  | 7 ++++---
 .../data/scripts/handlers/effecthandlers/SummonCubic.java  | 7 ++++---
 .../data/scripts/handlers/effecthandlers/SummonCubic.java  | 7 ++++---
 .../data/scripts/handlers/effecthandlers/SummonCubic.java  | 7 ++++---
 .../data/scripts/handlers/effecthandlers/SummonCubic.java  | 7 ++++---
 .../data/scripts/handlers/effecthandlers/SummonCubic.java  | 7 ++++---
 .../data/scripts/handlers/effecthandlers/SummonCubic.java  | 7 ++++---
 .../data/scripts/handlers/effecthandlers/SummonCubic.java  | 7 ++++---
 .../data/scripts/handlers/effecthandlers/SummonCubic.java  | 7 ++++---
 .../data/scripts/handlers/effecthandlers/SummonCubic.java  | 7 ++++---
 15 files changed, 60 insertions(+), 45 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
index 2be750a918..6fd2917569 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
@@ -90,9 +90,10 @@ public class SummonCubic extends AbstractEffect
 		{
 			// If maximum amount is reached, random cubic is removed.
 			// Players with no mastery can have only one cubic.
-			final double allowedCubicCount = effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 0);
-			final int currentCubicCount = player.getCubics().size();
+			final double allowedCubicCount = player.getStat().getValue(Stats.MAX_CUBIC, 1);
+			
 			// Extra cubics are removed, one by one, randomly.
+			final int currentCubicCount = player.getCubics().size();
 			if (currentCubicCount >= allowedCubicCount)
 			{
 				player.getCubics().values().stream().skip((int) (currentCubicCount * Rnd.nextDouble())).findAny().get().deactivate();
@@ -107,7 +108,7 @@ public class SummonCubic extends AbstractEffect
 		}
 		
 		// Adding a new cubic.
-		player.addCubic(new CubicInstance(effected.getActingPlayer(), effector.getActingPlayer(), template));
+		player.addCubic(new CubicInstance(player, effector.getActingPlayer(), template));
 		player.sendPacket(new ExUserInfoCubic(player));
 		player.broadcastCharInfo();
 	}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
index 2be750a918..6fd2917569 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
@@ -90,9 +90,10 @@ public class SummonCubic extends AbstractEffect
 		{
 			// If maximum amount is reached, random cubic is removed.
 			// Players with no mastery can have only one cubic.
-			final double allowedCubicCount = effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 0);
-			final int currentCubicCount = player.getCubics().size();
+			final double allowedCubicCount = player.getStat().getValue(Stats.MAX_CUBIC, 1);
+			
 			// Extra cubics are removed, one by one, randomly.
+			final int currentCubicCount = player.getCubics().size();
 			if (currentCubicCount >= allowedCubicCount)
 			{
 				player.getCubics().values().stream().skip((int) (currentCubicCount * Rnd.nextDouble())).findAny().get().deactivate();
@@ -107,7 +108,7 @@ public class SummonCubic extends AbstractEffect
 		}
 		
 		// Adding a new cubic.
-		player.addCubic(new CubicInstance(effected.getActingPlayer(), effector.getActingPlayer(), template));
+		player.addCubic(new CubicInstance(player, effector.getActingPlayer(), template));
 		player.sendPacket(new ExUserInfoCubic(player));
 		player.broadcastCharInfo();
 	}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
index 2be750a918..6fd2917569 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
@@ -90,9 +90,10 @@ public class SummonCubic extends AbstractEffect
 		{
 			// If maximum amount is reached, random cubic is removed.
 			// Players with no mastery can have only one cubic.
-			final double allowedCubicCount = effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 0);
-			final int currentCubicCount = player.getCubics().size();
+			final double allowedCubicCount = player.getStat().getValue(Stats.MAX_CUBIC, 1);
+			
 			// Extra cubics are removed, one by one, randomly.
+			final int currentCubicCount = player.getCubics().size();
 			if (currentCubicCount >= allowedCubicCount)
 			{
 				player.getCubics().values().stream().skip((int) (currentCubicCount * Rnd.nextDouble())).findAny().get().deactivate();
@@ -107,7 +108,7 @@ public class SummonCubic extends AbstractEffect
 		}
 		
 		// Adding a new cubic.
-		player.addCubic(new CubicInstance(effected.getActingPlayer(), effector.getActingPlayer(), template));
+		player.addCubic(new CubicInstance(player, effector.getActingPlayer(), template));
 		player.sendPacket(new ExUserInfoCubic(player));
 		player.broadcastCharInfo();
 	}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
index 2be750a918..6fd2917569 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
@@ -90,9 +90,10 @@ public class SummonCubic extends AbstractEffect
 		{
 			// If maximum amount is reached, random cubic is removed.
 			// Players with no mastery can have only one cubic.
-			final double allowedCubicCount = effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 0);
-			final int currentCubicCount = player.getCubics().size();
+			final double allowedCubicCount = player.getStat().getValue(Stats.MAX_CUBIC, 1);
+			
 			// Extra cubics are removed, one by one, randomly.
+			final int currentCubicCount = player.getCubics().size();
 			if (currentCubicCount >= allowedCubicCount)
 			{
 				player.getCubics().values().stream().skip((int) (currentCubicCount * Rnd.nextDouble())).findAny().get().deactivate();
@@ -107,7 +108,7 @@ public class SummonCubic extends AbstractEffect
 		}
 		
 		// Adding a new cubic.
-		player.addCubic(new CubicInstance(effected.getActingPlayer(), effector.getActingPlayer(), template));
+		player.addCubic(new CubicInstance(player, effector.getActingPlayer(), template));
 		player.sendPacket(new ExUserInfoCubic(player));
 		player.broadcastCharInfo();
 	}
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
index 2be750a918..6fd2917569 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
@@ -90,9 +90,10 @@ public class SummonCubic extends AbstractEffect
 		{
 			// If maximum amount is reached, random cubic is removed.
 			// Players with no mastery can have only one cubic.
-			final double allowedCubicCount = effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 0);
-			final int currentCubicCount = player.getCubics().size();
+			final double allowedCubicCount = player.getStat().getValue(Stats.MAX_CUBIC, 1);
+			
 			// Extra cubics are removed, one by one, randomly.
+			final int currentCubicCount = player.getCubics().size();
 			if (currentCubicCount >= allowedCubicCount)
 			{
 				player.getCubics().values().stream().skip((int) (currentCubicCount * Rnd.nextDouble())).findAny().get().deactivate();
@@ -107,7 +108,7 @@ public class SummonCubic extends AbstractEffect
 		}
 		
 		// Adding a new cubic.
-		player.addCubic(new CubicInstance(effected.getActingPlayer(), effector.getActingPlayer(), template));
+		player.addCubic(new CubicInstance(player, effector.getActingPlayer(), template));
 		player.sendPacket(new ExUserInfoCubic(player));
 		player.broadcastCharInfo();
 	}
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
index 2be750a918..6fd2917569 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
@@ -90,9 +90,10 @@ public class SummonCubic extends AbstractEffect
 		{
 			// If maximum amount is reached, random cubic is removed.
 			// Players with no mastery can have only one cubic.
-			final double allowedCubicCount = effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 0);
-			final int currentCubicCount = player.getCubics().size();
+			final double allowedCubicCount = player.getStat().getValue(Stats.MAX_CUBIC, 1);
+			
 			// Extra cubics are removed, one by one, randomly.
+			final int currentCubicCount = player.getCubics().size();
 			if (currentCubicCount >= allowedCubicCount)
 			{
 				player.getCubics().values().stream().skip((int) (currentCubicCount * Rnd.nextDouble())).findAny().get().deactivate();
@@ -107,7 +108,7 @@ public class SummonCubic extends AbstractEffect
 		}
 		
 		// Adding a new cubic.
-		player.addCubic(new CubicInstance(effected.getActingPlayer(), effector.getActingPlayer(), template));
+		player.addCubic(new CubicInstance(player, effector.getActingPlayer(), template));
 		player.sendPacket(new ExUserInfoCubic(player));
 		player.broadcastCharInfo();
 	}
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
index 2be750a918..6fd2917569 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
@@ -90,9 +90,10 @@ public class SummonCubic extends AbstractEffect
 		{
 			// If maximum amount is reached, random cubic is removed.
 			// Players with no mastery can have only one cubic.
-			final double allowedCubicCount = effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 0);
-			final int currentCubicCount = player.getCubics().size();
+			final double allowedCubicCount = player.getStat().getValue(Stats.MAX_CUBIC, 1);
+			
 			// Extra cubics are removed, one by one, randomly.
+			final int currentCubicCount = player.getCubics().size();
 			if (currentCubicCount >= allowedCubicCount)
 			{
 				player.getCubics().values().stream().skip((int) (currentCubicCount * Rnd.nextDouble())).findAny().get().deactivate();
@@ -107,7 +108,7 @@ public class SummonCubic extends AbstractEffect
 		}
 		
 		// Adding a new cubic.
-		player.addCubic(new CubicInstance(effected.getActingPlayer(), effector.getActingPlayer(), template));
+		player.addCubic(new CubicInstance(player, effector.getActingPlayer(), template));
 		player.sendPacket(new ExUserInfoCubic(player));
 		player.broadcastCharInfo();
 	}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
index 2be750a918..6fd2917569 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
@@ -90,9 +90,10 @@ public class SummonCubic extends AbstractEffect
 		{
 			// If maximum amount is reached, random cubic is removed.
 			// Players with no mastery can have only one cubic.
-			final double allowedCubicCount = effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 0);
-			final int currentCubicCount = player.getCubics().size();
+			final double allowedCubicCount = player.getStat().getValue(Stats.MAX_CUBIC, 1);
+			
 			// Extra cubics are removed, one by one, randomly.
+			final int currentCubicCount = player.getCubics().size();
 			if (currentCubicCount >= allowedCubicCount)
 			{
 				player.getCubics().values().stream().skip((int) (currentCubicCount * Rnd.nextDouble())).findAny().get().deactivate();
@@ -107,7 +108,7 @@ public class SummonCubic extends AbstractEffect
 		}
 		
 		// Adding a new cubic.
-		player.addCubic(new CubicInstance(effected.getActingPlayer(), effector.getActingPlayer(), template));
+		player.addCubic(new CubicInstance(player, effector.getActingPlayer(), template));
 		player.sendPacket(new ExUserInfoCubic(player));
 		player.broadcastCharInfo();
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
index 2be750a918..6fd2917569 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
@@ -90,9 +90,10 @@ public class SummonCubic extends AbstractEffect
 		{
 			// If maximum amount is reached, random cubic is removed.
 			// Players with no mastery can have only one cubic.
-			final double allowedCubicCount = effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 0);
-			final int currentCubicCount = player.getCubics().size();
+			final double allowedCubicCount = player.getStat().getValue(Stats.MAX_CUBIC, 1);
+			
 			// Extra cubics are removed, one by one, randomly.
+			final int currentCubicCount = player.getCubics().size();
 			if (currentCubicCount >= allowedCubicCount)
 			{
 				player.getCubics().values().stream().skip((int) (currentCubicCount * Rnd.nextDouble())).findAny().get().deactivate();
@@ -107,7 +108,7 @@ public class SummonCubic extends AbstractEffect
 		}
 		
 		// Adding a new cubic.
-		player.addCubic(new CubicInstance(effected.getActingPlayer(), effector.getActingPlayer(), template));
+		player.addCubic(new CubicInstance(player, effector.getActingPlayer(), template));
 		player.sendPacket(new ExUserInfoCubic(player));
 		player.broadcastCharInfo();
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
index 2be750a918..6fd2917569 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
@@ -90,9 +90,10 @@ public class SummonCubic extends AbstractEffect
 		{
 			// If maximum amount is reached, random cubic is removed.
 			// Players with no mastery can have only one cubic.
-			final double allowedCubicCount = effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 0);
-			final int currentCubicCount = player.getCubics().size();
+			final double allowedCubicCount = player.getStat().getValue(Stats.MAX_CUBIC, 1);
+			
 			// Extra cubics are removed, one by one, randomly.
+			final int currentCubicCount = player.getCubics().size();
 			if (currentCubicCount >= allowedCubicCount)
 			{
 				player.getCubics().values().stream().skip((int) (currentCubicCount * Rnd.nextDouble())).findAny().get().deactivate();
@@ -107,7 +108,7 @@ public class SummonCubic extends AbstractEffect
 		}
 		
 		// Adding a new cubic.
-		player.addCubic(new CubicInstance(effected.getActingPlayer(), effector.getActingPlayer(), template));
+		player.addCubic(new CubicInstance(player, effector.getActingPlayer(), template));
 		player.sendPacket(new ExUserInfoCubic(player));
 		player.broadcastCharInfo();
 	}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
index 2be750a918..6fd2917569 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
@@ -90,9 +90,10 @@ public class SummonCubic extends AbstractEffect
 		{
 			// If maximum amount is reached, random cubic is removed.
 			// Players with no mastery can have only one cubic.
-			final double allowedCubicCount = effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 0);
-			final int currentCubicCount = player.getCubics().size();
+			final double allowedCubicCount = player.getStat().getValue(Stats.MAX_CUBIC, 1);
+			
 			// Extra cubics are removed, one by one, randomly.
+			final int currentCubicCount = player.getCubics().size();
 			if (currentCubicCount >= allowedCubicCount)
 			{
 				player.getCubics().values().stream().skip((int) (currentCubicCount * Rnd.nextDouble())).findAny().get().deactivate();
@@ -107,7 +108,7 @@ public class SummonCubic extends AbstractEffect
 		}
 		
 		// Adding a new cubic.
-		player.addCubic(new CubicInstance(effected.getActingPlayer(), effector.getActingPlayer(), template));
+		player.addCubic(new CubicInstance(player, effector.getActingPlayer(), template));
 		player.sendPacket(new ExUserInfoCubic(player));
 		player.broadcastCharInfo();
 	}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
index 2be750a918..6fd2917569 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
@@ -90,9 +90,10 @@ public class SummonCubic extends AbstractEffect
 		{
 			// If maximum amount is reached, random cubic is removed.
 			// Players with no mastery can have only one cubic.
-			final double allowedCubicCount = effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 0);
-			final int currentCubicCount = player.getCubics().size();
+			final double allowedCubicCount = player.getStat().getValue(Stats.MAX_CUBIC, 1);
+			
 			// Extra cubics are removed, one by one, randomly.
+			final int currentCubicCount = player.getCubics().size();
 			if (currentCubicCount >= allowedCubicCount)
 			{
 				player.getCubics().values().stream().skip((int) (currentCubicCount * Rnd.nextDouble())).findAny().get().deactivate();
@@ -107,7 +108,7 @@ public class SummonCubic extends AbstractEffect
 		}
 		
 		// Adding a new cubic.
-		player.addCubic(new CubicInstance(effected.getActingPlayer(), effector.getActingPlayer(), template));
+		player.addCubic(new CubicInstance(player, effector.getActingPlayer(), template));
 		player.sendPacket(new ExUserInfoCubic(player));
 		player.broadcastCharInfo();
 	}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
index 2be750a918..6fd2917569 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
@@ -90,9 +90,10 @@ public class SummonCubic extends AbstractEffect
 		{
 			// If maximum amount is reached, random cubic is removed.
 			// Players with no mastery can have only one cubic.
-			final double allowedCubicCount = effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 0);
-			final int currentCubicCount = player.getCubics().size();
+			final double allowedCubicCount = player.getStat().getValue(Stats.MAX_CUBIC, 1);
+			
 			// Extra cubics are removed, one by one, randomly.
+			final int currentCubicCount = player.getCubics().size();
 			if (currentCubicCount >= allowedCubicCount)
 			{
 				player.getCubics().values().stream().skip((int) (currentCubicCount * Rnd.nextDouble())).findAny().get().deactivate();
@@ -107,7 +108,7 @@ public class SummonCubic extends AbstractEffect
 		}
 		
 		// Adding a new cubic.
-		player.addCubic(new CubicInstance(effected.getActingPlayer(), effector.getActingPlayer(), template));
+		player.addCubic(new CubicInstance(player, effector.getActingPlayer(), template));
 		player.sendPacket(new ExUserInfoCubic(player));
 		player.broadcastCharInfo();
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
index 2be750a918..6fd2917569 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
@@ -90,9 +90,10 @@ public class SummonCubic extends AbstractEffect
 		{
 			// If maximum amount is reached, random cubic is removed.
 			// Players with no mastery can have only one cubic.
-			final double allowedCubicCount = effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 0);
-			final int currentCubicCount = player.getCubics().size();
+			final double allowedCubicCount = player.getStat().getValue(Stats.MAX_CUBIC, 1);
+			
 			// Extra cubics are removed, one by one, randomly.
+			final int currentCubicCount = player.getCubics().size();
 			if (currentCubicCount >= allowedCubicCount)
 			{
 				player.getCubics().values().stream().skip((int) (currentCubicCount * Rnd.nextDouble())).findAny().get().deactivate();
@@ -107,7 +108,7 @@ public class SummonCubic extends AbstractEffect
 		}
 		
 		// Adding a new cubic.
-		player.addCubic(new CubicInstance(effected.getActingPlayer(), effector.getActingPlayer(), template));
+		player.addCubic(new CubicInstance(player, effector.getActingPlayer(), template));
 		player.sendPacket(new ExUserInfoCubic(player));
 		player.broadcastCharInfo();
 	}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
index 2be750a918..6fd2917569 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
@@ -90,9 +90,10 @@ public class SummonCubic extends AbstractEffect
 		{
 			// If maximum amount is reached, random cubic is removed.
 			// Players with no mastery can have only one cubic.
-			final double allowedCubicCount = effected.getActingPlayer().getStat().getValue(Stats.MAX_CUBIC, 0);
-			final int currentCubicCount = player.getCubics().size();
+			final double allowedCubicCount = player.getStat().getValue(Stats.MAX_CUBIC, 1);
+			
 			// Extra cubics are removed, one by one, randomly.
+			final int currentCubicCount = player.getCubics().size();
 			if (currentCubicCount >= allowedCubicCount)
 			{
 				player.getCubics().values().stream().skip((int) (currentCubicCount * Rnd.nextDouble())).findAny().get().deactivate();
@@ -107,7 +108,7 @@ public class SummonCubic extends AbstractEffect
 		}
 		
 		// Adding a new cubic.
-		player.addCubic(new CubicInstance(effected.getActingPlayer(), effector.getActingPlayer(), template));
+		player.addCubic(new CubicInstance(player, effector.getActingPlayer(), template));
 		player.sendPacket(new ExUserInfoCubic(player));
 		player.broadcastCharInfo();
 	}