more patches
This commit is contained in:
		
					parent
					
						
							
								cf306c3a89
							
						
					
				
			
			
				commit
				
					
						bfc788437f
					
				
			
		
					 58 changed files with 263 additions and 492 deletions
				
			
		
							
								
								
									
										48
									
								
								patches/server/Add-PlayerInitialSpawnEvent.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										48
									
								
								patches/server/Add-PlayerInitialSpawnEvent.patch
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,48 @@
 | 
			
		|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 | 
			
		||||
From: Steve Anton <anxuiz.nx@gmail.com>
 | 
			
		||||
Date: Thu, 3 Mar 2016 00:09:38 -0600
 | 
			
		||||
Subject: [PATCH] Add PlayerInitialSpawnEvent
 | 
			
		||||
 | 
			
		||||
For modifying a player's initial spawn location as they join the server
 | 
			
		||||
 | 
			
		||||
This is a duplicate API from spigot, so use our duplicate subclass and
 | 
			
		||||
improve setPosition to use raw
 | 
			
		||||
 | 
			
		||||
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
 | 
			
		||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 | 
			
		||||
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
 | 
			
		||||
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 | 
			
		||||
@@ -0,0 +0,0 @@ public abstract class PlayerList {
 | 
			
		||||
 
 | 
			
		||||
         // Spigot start - spawn location event
 | 
			
		||||
         Player bukkitPlayer = player.getBukkitEntity();
 | 
			
		||||
-        org.spigotmc.event.player.PlayerSpawnLocationEvent ev = new org.spigotmc.event.player.PlayerSpawnLocationEvent(bukkitPlayer, bukkitPlayer.getLocation());
 | 
			
		||||
+        org.spigotmc.event.player.PlayerSpawnLocationEvent ev = new com.destroystokyo.paper.event.player.PlayerInitialSpawnEvent(bukkitPlayer, bukkitPlayer.getLocation()); // Paper use our duplicate event
 | 
			
		||||
         this.cserver.getPluginManager().callEvent(ev);
 | 
			
		||||
 
 | 
			
		||||
         Location loc = ev.getSpawnLocation();
 | 
			
		||||
@@ -0,0 +0,0 @@ public abstract class PlayerList {
 | 
			
		||||
 
 | 
			
		||||
         player.setLevel(worldserver1);
 | 
			
		||||
         player.gameMode.setLevel((ServerLevel) player.level);
 | 
			
		||||
-        player.absMoveTo(loc.getX(), loc.getY(), loc.getZ(), loc.getYaw(), loc.getPitch());
 | 
			
		||||
+        // Paper start - set raw so we aren't fully joined to the world (not added to chunk or world)
 | 
			
		||||
+        player.setPosRaw(loc.getX(), loc.getY(), loc.getZ());
 | 
			
		||||
+        player.setRot(loc.getYaw(), loc.getPitch());
 | 
			
		||||
+        // Paper end
 | 
			
		||||
         // Spigot end
 | 
			
		||||
 
 | 
			
		||||
         // CraftBukkit - Moved message to after join
 | 
			
		||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
 | 
			
		||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 | 
			
		||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
 | 
			
		||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
 | 
			
		||||
@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
 | 
			
		||||
         return d1 * d1 + d2 * d2 + d3 * d3 < radius * radius;
 | 
			
		||||
     }
 | 
			
		||||
 
 | 
			
		||||
-    protected void setRot(float yaw, float pitch) {
 | 
			
		||||
+    public void setRot(float yaw, float pitch) { // Paper - protected -> public
 | 
			
		||||
         // CraftBukkit start - yaw was sometimes set to NaN, so we need to set it back to 0
 | 
			
		||||
         if (Float.isNaN(yaw)) {
 | 
			
		||||
             yaw = 0;
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue