player.setGamemode(int gamemode, AdventureSettings newSettings);

CloudburstMC · Oct 9, 2016 · 334e550 · 334e550
1 parent 787e6eb
commit 334e550
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/server/src/main/java/cn/nukkit/Player.java b/server/src/main/java/cn/nukkit/Player.java
@@ -960,14 +960,20 @@ public int getGamemode() {
  }
 
  public boolean setGamemode(int gamemode) {
+ return this.setGamemode(gamemode, null);
+ }
+
+ public boolean setGamemode(int gamemode, AdventureSettings newSettings) {
  if (gamemode < 0 || gamemode > 3 || this.gamemode == gamemode) {
  return false;
  }
 
- AdventureSettings newSettings = this.getAdventureSettings().clone(this);
- newSettings.setCanDestroyBlock((gamemode & 0x02) == 0);
- newSettings.setCanFly((gamemode & 0x01) > 0);
- newSettings.setNoclip(gamemode == 0x03);
+ if (newSettings == null) {
+ newSettings = this.getAdventureSettings().clone(this);
+ newSettings.setCanDestroyBlock((gamemode & 0x02) == 0);
+ newSettings.setCanFly((gamemode & 0x01) > 0);
+ newSettings.setNoclip(gamemode == 0x03);
+ }
 
  PlayerGameModeChangeEvent ev;
  this.server.getPluginManager().callEvent(ev = new PlayerGameModeChangeEvent(this, gamemode, newSettings));