Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to 1.16.4 ^_^

Browse Source
This commit is contained in:
William Blake Galbreath
2020-11-03 01:27:33 -06:00
parent 0fa478d031
commit 03654a6880
58 changed files with 472 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0086-Item-entity-immunities.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Item entity immunities
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 8dc40e815..53b297247 100644
index 322a259702..8dd1b5bc3c 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1449,6 +1449,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1450,6 +1450,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
@@ -17,7 +17,7 @@ index 8dc40e815..53b297247 100644
return this.O == tag;
}
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index bc4f84c88..b6cb52c10 100644
index ba73d14437..f55d40c981 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -23,6 +23,8 @@ public class EntityItem extends Entity {
@@ -68,7 +68,7 @@ index bc4f84c88..b6cb52c10 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
index aea72b0db..29731da08 100644
index aea72b0db1..29731da08d 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -106,6 +106,15 @@ public class EntityTrackerEntry {
@@ -88,7 +88,7 @@ index aea72b0db..29731da08 100644
int i;
int j;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d0e410ad5..59f5e91df 100644
index 998751ab80..bc7124b911 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -101,6 +101,21 @@ public class PurpurWorldConfig {
@@ -114,7 +114,7 @@ index d0e410ad5..59f5e91df 100644
public boolean idleTimeoutTickNearbyEntities = true;
public boolean idleTimeoutCountAsSleeping = false;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
index d6a64e4ec..3e9f2f662 100644
index d6a64e4ecf..3e9f2f6626 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
@@ -88,4 +88,26 @@ public class CraftItem extends CraftEntity implements Item {