From 7454852c91dee6992ed8e17e94c1a14dd4f6322f Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 25 Apr 2022 22:15:22 +0000 Subject: [PATCH] Naming corrections related with fish location. --- .../gameserver/model/actor/Player.java | 30 +++++++++---------- .../network/serverpackets/CharInfo.java | 6 ++-- .../network/serverpackets/UserInfo.java | 6 ++-- .../gameserver/model/actor/Player.java | 30 +++++++++---------- .../network/serverpackets/CharInfo.java | 6 ++-- .../network/serverpackets/UserInfo.java | 6 ++-- .../gameserver/model/actor/Player.java | 30 +++++++++---------- .../network/serverpackets/CharInfo.java | 6 ++-- .../network/serverpackets/UserInfo.java | 6 ++-- 9 files changed, 63 insertions(+), 63 deletions(-) diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java index 5b87f614b5..6e589f23b7 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -688,9 +688,9 @@ public class Player extends Playable private Fishing _fishCombat; private boolean _fishing = false; - private int _fishx = 0; - private int _fishy = 0; - private int _fishz = 0; + private int _fishX = 0; + private int _fishY = 0; + private int _fishZ = 0; private ScheduledFuture _taskRentPet; private ScheduledFuture _taskWater; @@ -11046,9 +11046,9 @@ public class Player extends Playable stopMove(null); setImmobilized(true); _fishing = true; - _fishx = x; - _fishy = y; - _fishz = z; + _fishX = x; + _fishY = y; + _fishZ = z; // broadcastUserInfo(); // Starts fishing final int lvl = getRandomFishLvl(); @@ -11438,9 +11438,9 @@ public class Player extends Playable public void endFishing(boolean win) { _fishing = false; - _fishx = 0; - _fishy = 0; - _fishz = 0; + _fishX = 0; + _fishY = 0; + _fishZ = 0; // broadcastUserInfo(); if (_fishCombat == null) { @@ -11460,19 +11460,19 @@ public class Player extends Playable return _fishCombat; } - public int getFishx() + public int getFishX() { - return _fishx; + return _fishX; } - public int getFishy() + public int getFishY() { - return _fishy; + return _fishY; } - public int getFishz() + public int getFishZ() { - return _fishz; + return _fishZ; } public void setLure(Item lure) diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 9f38a549b0..ac5c0bea3f 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -201,9 +201,9 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // Hero Aura packet.writeC(_player.isFishing() ? 1 : 0); // 1: Fishing Mode (Cant be undone by setting back to 0) - packet.writeD(_player.getFishx()); - packet.writeD(_player.getFishy()); - packet.writeD(_player.getFishz()); + packet.writeD(_player.getFishX()); + packet.writeD(_player.getFishY()); + packet.writeD(_player.getFishZ()); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_heading); diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 68ff317d46..c7e88a83a5 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -233,9 +233,9 @@ public class UserInfo implements IClientOutgoingPacket packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // 1: Hero Aura packet.writeC(_player.isFishing() ? 1 : 0); // Fishing Mode - packet.writeD(_player.getFishx()); // fishing x - packet.writeD(_player.getFishy()); // fishing y - packet.writeD(_player.getFishz()); // fishing z + packet.writeD(_player.getFishX()); // fishing x + packet.writeD(_player.getFishY()); // fishing y + packet.writeD(_player.getFishZ()); // fishing z packet.writeD(_player.getAppearance().getNameColor()); // new c5 diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java index 86a5b2df06..ac9863ce29 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -739,9 +739,9 @@ public class Player extends Playable private Fishing _fishCombat; private boolean _fishing = false; - private int _fishx = 0; - private int _fishy = 0; - private int _fishz = 0; + private int _fishX = 0; + private int _fishY = 0; + private int _fishZ = 0; private ScheduledFuture _taskRentPet; private ScheduledFuture _taskWater; @@ -11626,9 +11626,9 @@ public class Player extends Playable stopMove(null); setImmobilized(true); _fishing = true; - _fishx = x; - _fishy = y; - _fishz = z; + _fishX = x; + _fishY = y; + _fishZ = z; // broadcastUserInfo(); // Starts fishing final int lvl = getRandomFishLvl(); @@ -12018,9 +12018,9 @@ public class Player extends Playable public void endFishing(boolean win) { _fishing = false; - _fishx = 0; - _fishy = 0; - _fishz = 0; + _fishX = 0; + _fishY = 0; + _fishZ = 0; // broadcastUserInfo(); if (_fishCombat == null) { @@ -12040,19 +12040,19 @@ public class Player extends Playable return _fishCombat; } - public int getFishx() + public int getFishX() { - return _fishx; + return _fishX; } - public int getFishy() + public int getFishY() { - return _fishy; + return _fishY; } - public int getFishz() + public int getFishZ() { - return _fishz; + return _fishZ; } public void setLure(Item lure) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index df52567f51..3407282b98 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -212,9 +212,9 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // Hero Aura packet.writeC(_player.isFishing() ? 1 : 0); // 1: Fishing Mode (Cant be undone by setting back to 0) - packet.writeD(_player.getFishx()); - packet.writeD(_player.getFishy()); - packet.writeD(_player.getFishz()); + packet.writeD(_player.getFishX()); + packet.writeD(_player.getFishY()); + packet.writeD(_player.getFishZ()); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_heading); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index f167e53566..e5b80e4426 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -200,9 +200,9 @@ public class UserInfo implements IClientOutgoingPacket packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // 1: Hero Aura packet.writeC(_player.isFishing() ? 1 : 0); // Fishing Mode - packet.writeD(_player.getFishx()); // fishing x - packet.writeD(_player.getFishy()); // fishing y - packet.writeD(_player.getFishz()); // fishing z + packet.writeD(_player.getFishX()); // fishing x + packet.writeD(_player.getFishY()); // fishing y + packet.writeD(_player.getFishZ()); // fishing z packet.writeD(_player.getAppearance().getNameColor()); // new c5 diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java index e55f14157d..51c292eba4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -758,9 +758,9 @@ public class Player extends Playable private Fishing _fishCombat; private boolean _fishing = false; - private int _fishx = 0; - private int _fishy = 0; - private int _fishz = 0; + private int _fishX = 0; + private int _fishY = 0; + private int _fishZ = 0; private ScheduledFuture _taskRentPet; private ScheduledFuture _taskWater; @@ -11519,9 +11519,9 @@ public class Player extends Playable stopMove(null); setImmobilized(true); _fishing = true; - _fishx = x; - _fishy = y; - _fishz = z; + _fishX = x; + _fishY = y; + _fishZ = z; // broadcastUserInfo(); // Starts fishing final int lvl = getRandomFishLvl(); @@ -11911,9 +11911,9 @@ public class Player extends Playable public void endFishing(boolean win) { _fishing = false; - _fishx = 0; - _fishy = 0; - _fishz = 0; + _fishX = 0; + _fishY = 0; + _fishZ = 0; // broadcastUserInfo(); if (_fishCombat == null) { @@ -11933,19 +11933,19 @@ public class Player extends Playable return _fishCombat; } - public int getFishx() + public int getFishX() { - return _fishx; + return _fishX; } - public int getFishy() + public int getFishY() { - return _fishy; + return _fishY; } - public int getFishz() + public int getFishZ() { - return _fishz; + return _fishZ; } public void setLure(Item lure) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 365b77ba7f..21547ba0d1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -203,9 +203,9 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // Hero Aura packet.writeC(_player.isFishing() ? 1 : 0); // 1: Fishing Mode (Cant be undone by setting back to 0) - packet.writeD(_player.getFishx()); - packet.writeD(_player.getFishy()); - packet.writeD(_player.getFishz()); + packet.writeD(_player.getFishX()); + packet.writeD(_player.getFishY()); + packet.writeD(_player.getFishZ()); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_heading); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index bdce530f90..0da5db8bc8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -200,9 +200,9 @@ public class UserInfo implements IClientOutgoingPacket packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // 1: Hero Aura packet.writeC(_player.isFishing() ? 1 : 0); // Fishing Mode - packet.writeD(_player.getFishx()); // fishing x - packet.writeD(_player.getFishy()); // fishing y - packet.writeD(_player.getFishz()); // fishing z + packet.writeD(_player.getFishX()); // fishing x + packet.writeD(_player.getFishY()); // fishing y + packet.writeD(_player.getFishZ()); // fishing z packet.writeD(_player.getAppearance().getNameColor()); // new c5