Merge branch 'master' into ver/1.14

2019-05-27 01:16:47 +01:00
parent d627cfa110 07762fc610
commit e9c7232267
80 changed files with 94 additions and 127 deletions
--- a/Spigot-Server-Patches/0372-Implement-PlayerPostRespawnEvent.patch
+++ b/Spigot-Server-Patches/0372-Implement-PlayerPostRespawnEvent.patch
@@ -0,0 +1,51 @@
+From fdcd5e2ccf83dd0bf0a1368ac0d5ef27e7ebea5c Mon Sep 17 00:00:00 2001
+From: MisterVector <whizkid3000@hotmail.com>
+Date: Fri, 26 Oct 2018 21:31:00 -0700
+Subject: [PATCH] Implement PlayerPostRespawnEvent
+
+
+diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
+index 5645147dad..0e7e47f831 100644
+--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
+@@ -637,9 +637,14 @@ public abstract class PlayerList {
+ 
+         // this.a(entityplayer1, entityplayer, worldserver); // CraftBukkit - removed
+ 
+        // Paper start
+        boolean isBedSpawn = false;
+        boolean isRespawn = false;
+        // Paper end
+
+         // CraftBukkit start - fire PlayerRespawnEvent
+         if (location == null) {
+-            boolean isBedSpawn = false;
+            //boolean isBedSpawn = false; Paper - moved up
+             CraftWorld cworld = (CraftWorld) this.server.server.getWorld(entityplayer.spawnWorld);
+             if (cworld != null && blockposition != null) {
+             Optional<Vec3D> optional = EntityHuman.getBed(cworld.getHandle(), blockposition, flag1);
+@@ -672,6 +677,7 @@ public abstract class PlayerList {
+ 
+             location = respawnEvent.getRespawnLocation();
+             if (!flag) entityplayer.reset(); // SPIGOT-4785
+            isRespawn = true; // Paper
+         } else {
+             location.setWorld(server.getWorldServer(dimensionmanager).getWorld());
+         }
+@@ -733,6 +739,13 @@ public abstract class PlayerList {
+         if (entityplayer.playerConnection.isDisconnected()) {
+             this.savePlayerFile(entityplayer);
+         }
+
+        // Paper start
+        if (isRespawn) {
+            cserver.getPluginManager().callEvent(new com.destroystokyo.paper.event.player.PlayerPostRespawnEvent(entityplayer.getBukkitEntity(), location, isBedSpawn));
+        }
+        // Paper end
+
+         // CraftBukkit end
+         return entityplayer1;
+     }
+-- 
+2.21.0
+