More more more more more work
This commit is contained in:
		
					parent
					
						
							
								e165710bb5
							
						
					
				
			
			
				commit
				
					
						7409d8fed7
					
				
			
		
					 39 changed files with 31 additions and 32 deletions
				
			
		
							
								
								
									
										45
									
								
								patches/server/Add-openSign-method-to-HumanEntity.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										45
									
								
								patches/server/Add-openSign-method-to-HumanEntity.patch
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,45 @@
 | 
			
		|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 | 
			
		||||
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 | 
			
		||||
Date: Sun, 1 Apr 2018 02:29:37 +0300
 | 
			
		||||
Subject: [PATCH] Add openSign method to HumanEntity
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 | 
			
		||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 | 
			
		||||
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 | 
			
		||||
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 | 
			
		||||
@@ -0,0 +0,0 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
 | 
			
		||||
         super.applyTo(sign);
 | 
			
		||||
     }
 | 
			
		||||
 
 | 
			
		||||
-    public static void openSign(Sign sign, Player player) {
 | 
			
		||||
+    public static void openSign(Sign sign, org.bukkit.entity.HumanEntity player) { // Paper - change move open sign to HumanEntity
 | 
			
		||||
         Preconditions.checkArgument(sign != null, "sign == null");
 | 
			
		||||
-        Preconditions.checkArgument(sign.isPlaced(), "Sign must be placed");
 | 
			
		||||
+        // Preconditions.checkArgument(sign.isPlaced(), "Sign must be placed"); // Paper - don't require placed
 | 
			
		||||
         Preconditions.checkArgument(sign.getWorld() == player.getWorld(), "Sign must be in same world as Player");
 | 
			
		||||
 
 | 
			
		||||
         SignBlockEntity handle = ((CraftSign<?>) sign).getTileEntity();
 | 
			
		||||
 
 | 
			
		||||
-        ((CraftPlayer) player).getHandle().openTextEdit(handle, true);
 | 
			
		||||
+        ((org.bukkit.craftbukkit.entity.CraftHumanEntity) player).getHandle().openTextEdit(handle, true); // Paper - change move open sign to HumanEntity
 | 
			
		||||
     }
 | 
			
		||||
 
 | 
			
		||||
     // Paper start
 | 
			
		||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 | 
			
		||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 | 
			
		||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 | 
			
		||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 | 
			
		||||
@@ -0,0 +0,0 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
 | 
			
		||||
         }
 | 
			
		||||
     }
 | 
			
		||||
 
 | 
			
		||||
+    // Paper start - move open sign method to HumanEntity
 | 
			
		||||
+    @Override
 | 
			
		||||
+    public void openSign(org.bukkit.block.Sign sign) {
 | 
			
		||||
+        org.bukkit.craftbukkit.block.CraftSign.openSign(sign, this);
 | 
			
		||||
+    }
 | 
			
		||||
+    // Paper end
 | 
			
		||||
     @Override
 | 
			
		||||
     public boolean dropItem(boolean dropAll) {
 | 
			
		||||
         if (!(this.getHandle() instanceof ServerPlayer)) return false;
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue