Skip to content

Commit

Permalink
Merge branch 'master' of github.com:EngineHub/CommandHelper
Browse files Browse the repository at this point in the history
  • Loading branch information
LadyCailin committed Jan 29, 2024
2 parents e4d81cb + d10e117 commit 1e28b48
Show file tree
Hide file tree
Showing 7 changed files with 85 additions and 455 deletions.
2 changes: 2 additions & 0 deletions src/main/java/com/laytonsmith/abstraction/MCPlayer.java
Original file line number Diff line number Diff line change
Expand Up @@ -195,4 +195,6 @@ public interface MCPlayer extends MCCommandSender, MCHumanEntity, MCOfflinePlaye
void setWorldBorder(MCWorldBorder border);

String getLocale();

void respawn();
}
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,6 @@ public void setAllDropChances(Map<MCEquipmentSlot, Float> slots) {
}
}

// For the purposes of faking a normal inventory, we most likely will not be accessing
// anything below this line, but they are here for flexibility and completion
@Override
public MCItemStack getWeapon() {
return new BukkitMCItemStack(ee.getItemInMainHand());
Expand Down
Loading

0 comments on commit 1e28b48

Please sign in to comment.