Adapted auto peel to main version.

Contributed by Index.
This commit is contained in:
MobiusDevelopment
2022-10-25 22:15:05 +00:00
parent 04e8766198
commit 28a2bb8758
15 changed files with 527 additions and 24 deletions

View File

@@ -10888,8 +10888,6 @@ public class Player extends Playable
@Override
public void onTeleported()
{
super.onTeleported();
// Stop auto peel.
if (hasRequest(AutoPeelRequest.class))
{
@@ -10898,6 +10896,8 @@ public class Player extends Playable
removeRequest(AutoPeelRequest.class);
}
super.onTeleported();
if (isInAirShip())
{
getAirShip().sendInfo(this);

View File

@@ -2588,21 +2588,6 @@ public class Item extends WorldObject
}
}
/**
* Returns the item in String format
* @return String
*/
@Override
public String toString()
{
final StringBuilder sb = new StringBuilder();
sb.append(_itemTemplate);
sb.append("[");
sb.append(getObjectId());
sb.append("]");
return sb.toString();
}
public void onVisualLifeTimeEnd()
{
onVisualLifeTimeEnd(true);
@@ -2658,4 +2643,19 @@ public class Item extends WorldObject
}
vars.storeMe();
}
/**
* Returns the item in String format
* @return String
*/
@Override
public String toString()
{
final StringBuilder sb = new StringBuilder();
sb.append(_itemTemplate);
sb.append("[");
sb.append(getObjectId());
sb.append("]");
return sb.toString();
}
}