Naming corrections related with fish location.
This commit is contained in:
parent
a7cf1ecb3c
commit
7454852c91
@ -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)
|
||||
|
@ -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);
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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);
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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);
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user