From cbc6d70c712f6a5a79b9abc4dad66ec9e5f30a65 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 26 Oct 2017 19:36:18 +0000
Subject: [PATCH] Fixed null caster for cubic instance.

---
 .../com/l2jmobius/gameserver/model/cubic/CubicInstance.java     | 2 +-
 .../com/l2jmobius/gameserver/model/cubic/CubicInstance.java     | 2 +-
 .../com/l2jmobius/gameserver/model/cubic/CubicInstance.java     | 2 +-
 .../com/l2jmobius/gameserver/model/cubic/CubicInstance.java     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/cubic/CubicInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/cubic/CubicInstance.java
index 33473d382d..a5c90d0c95 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/cubic/CubicInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/cubic/CubicInstance.java
@@ -47,7 +47,7 @@ public class CubicInstance
 	public CubicInstance(L2PcInstance owner, L2PcInstance caster, L2CubicTemplate template)
 	{
 		_owner = owner;
-		_caster = caster;
+		_caster = caster == null ? owner : caster;
 		_template = template;
 		activate();
 	}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/cubic/CubicInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/cubic/CubicInstance.java
index 33473d382d..a5c90d0c95 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/cubic/CubicInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/cubic/CubicInstance.java
@@ -47,7 +47,7 @@ public class CubicInstance
 	public CubicInstance(L2PcInstance owner, L2PcInstance caster, L2CubicTemplate template)
 	{
 		_owner = owner;
-		_caster = caster;
+		_caster = caster == null ? owner : caster;
 		_template = template;
 		activate();
 	}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/cubic/CubicInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/cubic/CubicInstance.java
index 33473d382d..a5c90d0c95 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/cubic/CubicInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/cubic/CubicInstance.java
@@ -47,7 +47,7 @@ public class CubicInstance
 	public CubicInstance(L2PcInstance owner, L2PcInstance caster, L2CubicTemplate template)
 	{
 		_owner = owner;
-		_caster = caster;
+		_caster = caster == null ? owner : caster;
 		_template = template;
 		activate();
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/cubic/CubicInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/cubic/CubicInstance.java
index 33473d382d..a5c90d0c95 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/cubic/CubicInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/cubic/CubicInstance.java
@@ -47,7 +47,7 @@ public class CubicInstance
 	public CubicInstance(L2PcInstance owner, L2PcInstance caster, L2CubicTemplate template)
 	{
 		_owner = owner;
-		_caster = caster;
+		_caster = caster == null ? owner : caster;
 		_template = template;
 		activate();
 	}