Skip to content

Fix restoring off-hand and cursor items after games #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GerwinVerkerk wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −0
Open

Fix restoring off-hand and cursor items after games #116

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/main/java/com/shanebeestudios/hg/api/data/PlayerData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ public class PlayerData implements Cloneable {
//Pregame data
private ItemStack[] inv;
private ItemStack[] equip;
private ItemStack[] extra;
private ItemStack cursor;
private int expL;
private float expP;
private double health;
Expand Down Expand Up @@ -67,13 +69,16 @@ public void backup() {
this.hasGameStarted = true;
this.inv = this.player.getInventory().getStorageContents();
this.equip = this.player.getInventory().getArmorContents();
this.extra = this.player.getInventory().getExtraContents();
this.cursor = this.player.getItemOnCursor();
this.expL = this.player.getLevel();
this.expP = this.player.getExp();
this.mode = this.player.getGameMode();
this.food = this.player.getFoodLevel();
this.saturation = this.player.getSaturation();
this.health = this.player.getHealth();
Util.clearInv(this.player);
this.player.setItemOnCursor(null);
this.player.setLevel(0);
this.player.setExp(0);
this.scoreboard = this.player.getScoreboard();
Expand All @@ -96,6 +101,8 @@ public void restore(Player player) {
player.setSaturation(this.saturation);
player.getInventory().setStorageContents(this.inv);
player.getInventory().setArmorContents(this.equip);
player.getInventory().setExtraContents(this.extra);
player.setItemOnCursor(this.cursor);
player.setGameMode(this.mode);
player.updateInventory();
player.setInvulnerable(false);
Expand Down Expand Up @@ -232,6 +239,8 @@ public String toString() {
return "PlayerData{" +
"inv=" + Arrays.toString(inv) +
", equip=" + Arrays.toString(equip) +
", extra=" + Arrays.toString(extra) +
", cursor=" + cursor +
", expLevel=" + expL +
", expPoints=" + expP +
", health=" + health +
Expand Down