Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

1.15.2 update (#2887)

Browse Source 
Functional GUI fix added by billygalbreath
This commit is contained in:
Spottedleaf
2020-01-21 18:02:07 -08:00
committed by Zach
parent d4ae43fc00
commit 19de9af63c
624 changed files with 2369 additions and 2370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0266-Implement-Expanded-ArmorStand-API.patch
View File

@@ -1,4 +1,4 @@
From 7d8dc4b2a0702e2339136d3324d43602c039d059 Mon Sep 17 00:00:00 2001
From 4383b1ee134cc543befaf00f504b7a4016da0ce1 Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Thu, 26 Jul 2018 02:25:46 -0400
Subject: [PATCH] Implement Expanded ArmorStand API
@@ -8,7 +8,7 @@ Add the following:
- Enable/Disable slot interactions
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 80bf58b052..eb6cf3a86b 100644
index 992d7bfb0..61d7d507a 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -36,7 +36,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -20,7 +20,7 @@ index 80bf58b052..eb6cf3a86b 100644
public Vector3f headPose;
public Vector3f bodyPose;
public Vector3f leftArmPose;
@@ -390,6 +390,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -385,6 +385,7 @@ public class EntityArmorStand extends EntityLiving {
return enumitemslot;
}
@@ -29,7 +29,7 @@ index 80bf58b052..eb6cf3a86b 100644
return (this.bB & 1 << enumitemslot.c()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms();
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
index 124c3185bc..d1d689e5d7 100644
index 124c3185b..d1d689e5d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
@@ -30,11 +30,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@@ -126,5 +126,5 @@ index 124c3185bc..d1d689e5d7 100644
// Paper end
}
--
2.24.1
2.25.0.windows.1