diff options
| author | md_5 <git@md-5.net> | 2016-10-23 14:00:35 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-10-23 14:00:35 +1100 |
| commit | 2e39de698d0998d4d5a2283686d192614505b7fa (patch) | |
| tree | 54d3a4f6d0b060247cabc2953f1e63a14a5fc850 /nms-patches/EntityPlayer.patch | |
| parent | d86d282f63938a2c5705b898090d04e15d92890c (diff) | |
| download | craftbukkit-2e39de698d0998d4d5a2283686d192614505b7fa.tar craftbukkit-2e39de698d0998d4d5a2283686d192614505b7fa.tar.gz craftbukkit-2e39de698d0998d4d5a2283686d192614505b7fa.tar.lz craftbukkit-2e39de698d0998d4d5a2283686d192614505b7fa.tar.xz craftbukkit-2e39de698d0998d4d5a2283686d192614505b7fa.zip | |
SPIGOT-1903, MC-98153: Portal Location Sync Issues
Diffstat (limited to 'nms-patches/EntityPlayer.patch')
| -rw-r--r-- | nms-patches/EntityPlayer.patch | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/nms-patches/EntityPlayer.patch b/nms-patches/EntityPlayer.patch index d9f1f242..d5fa2376 100644 --- a/nms-patches/EntityPlayer.patch +++ b/nms-patches/EntityPlayer.patch @@ -189,17 +189,17 @@ + } + } + } -+ -+ IChatBaseComponent chatmessage = this.getCombatTracker().getDeathMessage(); -+ -+ String deathmessage = chatmessage.toPlainText(); -+ org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, deathmessage, keepInventory); - if (scoreboardteambase != null && scoreboardteambase.getDeathMessageVisibility() != ScoreboardTeamBase.EnumNameTagVisibility.ALWAYS) { - if (scoreboardteambase.getDeathMessageVisibility() == ScoreboardTeamBase.EnumNameTagVisibility.HIDE_FOR_OTHER_TEAMS) { - this.server.getPlayerList().a((EntityHuman) this, this.getCombatTracker().getDeathMessage()); - } else if (scoreboardteambase.getDeathMessageVisibility() == ScoreboardTeamBase.EnumNameTagVisibility.HIDE_FOR_OWN_TEAM) { - this.server.getPlayerList().b((EntityHuman) this, this.getCombatTracker().getDeathMessage()); ++ IChatBaseComponent chatmessage = this.getCombatTracker().getDeathMessage(); ++ ++ String deathmessage = chatmessage.toPlainText(); ++ org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, deathmessage, keepInventory); ++ + String deathMessage = event.getDeathMessage(); + + if (deathMessage != null && deathMessage.length() > 0 && flag) { // TODO: allow plugins to override? @@ -512,7 +512,7 @@ } public void a(EnumHand enumhand) { -@@ -955,11 +1161,139 @@ +@@ -955,11 +1161,145 @@ } public void M() { @@ -615,6 +615,12 @@ + return super.toString() + "(" + this.getName() + " at " + this.locX + "," + this.locY + "," + this.locZ + ")"; + } + ++ // SPIGOT-1903, MC-98153 ++ public void forceSetPositionRotation(double x, double y, double z, float yaw, float pitch) { ++ this.setPositionRotation(x, y, z, yaw, pitch); ++ this.playerConnection.d(); ++ } ++ + public void reset() { + float exp = 0; + boolean keepInventory = this.world.getGameRules().getBoolean("keepInventory"); |