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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
5b20df6bf added PlayerNameEntityEvent
ff9c82444 Add worldborder events
616b1f3cd consider enchants for destroy speed
aaef1d5cc fix file conversion
674d8f7f7 Make discovered maps config work in treasure maps from loot tables too
be1687914 stop firing pressure plate EntityInteractEvent for ignored entities (fixes #4962)
7d56f38ed Do not use the bukkit singleton for the GUI (Fixes #5301)
4c9bdf53a Updated Upstream (Bukkit/CraftBukkit/Spigot) (#5299)
8647bd130 Improve ServerGUI
fcc6d3359 Throw proper exception on empty JsonList file
17d2e1291 Fix interact event in adventure mode
964e0bf42 MC-29274: Fix Wither hostility towards players
9e24a5213 Fixed furnace cook-speed multiplier losing precision when calculating cook time
c7e42faa3 Do not create unnecessary copies of the passenger list
40881ad67 added tnt minecarts to the tnt height nerf
26be708f4 Remove streams from SensorNearest
5b5989b21 fix nullability of playerlist header/footer, closes #5290
45bc531dd Fix Material#getTranslationKey for Block Materials (#5294)
This commit is contained in:
BillyGalbreath
2021-03-04 21:45:44 -06:00
parent 68ff99ea92
commit d93887a156
60 changed files with 169 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
patches/server/0102-Ridables.patch
View File

@@ -161,7 +161,7 @@ index bd0267ee4b3782f6d1ec39cba7966ba4f62f1adf..8b36ac2b0950a827763aa2357700f37e
this.B = true;
return this;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index efcdd07f92ff64b4ca6faa99a709f88e5bf8a4f9..9ca220f85089609921b1004c1244b0bc4b27b153 100644
index f0ce2fa068d9e442a8c0ad5d7e3a505e59556c89..8360f5656b1e5928a3ab73c808e85475dcee9420 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -105,7 +105,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1979,7 +1979,7 @@ index f958751b16abcc36910bb0b655ff2360459e2e4c..4ffc61acdff8c51dc9b111e3024c828f
protected void eK() {
this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue((double) this.fp());
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index 7604fd83de9cfe93d427a9a1f6bbbee76aa861e8..7958b69b2d4bee87ff5b38b8f724d248f41dff66 100644
index 895c092197404ad4911ec9f94d1bda1322e45fa7..ff10f512dc6062638c15980b46be10f50d08478c 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -39,12 +39,27 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -2125,10 +2125,10 @@ index 0e98173607c810e0e74552a2ba8febf292357c39..559ba50977147b8e2a0e7c1e7dc281fa
+ protected void eV() { if (world.purpurConfig.zombieHorseCanSwim) goalSelector.a(0, new PathfinderGoalFloat(this)); } // Purpur
}
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 093df82d49bfa6c34f081a719b5212ec8a312657..e6e180ea46529e80eeab95f550dee5f3f8198ba8 100644
index 10365180f518042d56929d0c0061e5297b73cf9b..9266a37f66337a6051c8472934e2e396e1131736 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -2136,4 +2136,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -2149,4 +2149,15 @@ public abstract class EntityHuman extends EntityLiving {
return this.g;
}
}
@@ -2354,7 +2354,7 @@ index bdff2368836dca230a6622a205d5772834afc6ee..9ee03b233b71d1b4b85a9a5e1f0ea9fe
float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index a7a5917fc7c6bbdecab26884cac361bcfb5b4178..1cdc181bb5e756bddca01ea8f10d319e35309733 100644
index 4b7ff69eac4dd5fd5c9b0b26d133daeb128c445d..af2b6bb559d78dd912eee02281f5446f31e55eae 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -463,7 +463,7 @@ public abstract class EntityLiving extends Entity {
@@ -3019,7 +3019,7 @@ index bdfe073dcd255a7359127f9ae3a962642be5526d..c70281fddcbe5a97a1eb176def99cdf3
EntityPhantom.this.yaw += 180.0F;
this.j = 0.1F;
diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
index 7f52c39234e69b612b89993ce4503c20690064ed..dade0bb29422ebd68fae0edb74cbbf6d3ab89d64 100644
index 6ea3e4ffc3f42f4282adf3554944f24d92ca2079..bf7ecd7a7d805cc8f1314a348d7b13f848da46b5 100644
--- a/src/main/java/net/minecraft/server/EntityPig.java
+++ b/src/main/java/net/minecraft/server/EntityPig.java
@@ -19,9 +19,22 @@ public class EntityPig extends EntityAnimal implements ISteerable, ISaddleable {
@@ -3486,7 +3486,7 @@ index 25a9b7906be35e981566610c7d08aa8df5050d74..b766a27e98e19bffd3fe8f81f750750a
this.d = flag;
}
diff --git a/src/main/java/net/minecraft/server/EntityRavager.java b/src/main/java/net/minecraft/server/EntityRavager.java
index fd1ac7df68a0caebe35290cdf7a9c37519342b61..a9021458814d84a3a82088f91956db73562c3b10 100644
index e78f158d9c682c60d42c17e0f171d492552e4079..9d0a462bfc56994ee35478cc9e565123620a9f08 100644
--- a/src/main/java/net/minecraft/server/EntityRavager.java
+++ b/src/main/java/net/minecraft/server/EntityRavager.java
@@ -20,14 +20,37 @@ public class EntityRavager extends EntityRaider {
@@ -4469,7 +4469,7 @@ index ca3c5150bcfe2a92b49ad5a27c23dd37a7054fbb..323d79a99402b0f6952b4fb873170069
this.targetSelector.a(2, this.br);
this.targetSelector.a(3, this.bs);
diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
index 2e623ef9be036ea467e9e41817c2eced018f8f93..0715e070c727fc26064f6602e9bad3b2681a6081 100644
index b1159f0258eca2bee52ec0939ba86792d24a1f99..f149eeb4dd2be51ef028998c0ec6398cb9b3f4bb 100644
--- a/src/main/java/net/minecraft/server/EntityWither.java
+++ b/src/main/java/net/minecraft/server/EntityWither.java
@@ -32,6 +32,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -4602,9 +4602,9 @@ index 2e623ef9be036ea467e9e41817c2eced018f8f93..0715e070c727fc26064f6602e9bad3b2
this.goalSelector.a(7, new PathfinderGoalRandomLookaround(this));
+ this.targetSelector.a(0, new PathfinderGoalHasRider(this)); // Purpur
this.targetSelector.a(1, new PathfinderGoalHurtByTarget(this, new Class[0]));
if(this.world.paperConfig.fixWitherTargetingBug) this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, 0, false, false, null)); // Paper - Fix MC-29274
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityInsentient.class, 0, false, false, EntityWither.by));
}
@@ -194,6 +302,16 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -195,6 +303,16 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@Override
protected void mobTick() {
@@ -4621,7 +4621,7 @@ index 2e623ef9be036ea467e9e41817c2eced018f8f93..0715e070c727fc26064f6602e9bad3b2
int i;
if (this.getInvul() > 0) {
@@ -377,7 +495,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -378,7 +496,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
this.bossBattle.removePlayer(entityplayer);
}
@@ -4630,7 +4630,7 @@ index 2e623ef9be036ea467e9e41817c2eced018f8f93..0715e070c727fc26064f6602e9bad3b2
if (i <= 0) {
return this.locX();
} else {
@@ -388,11 +506,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -389,11 +507,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
}
}
@@ -4644,7 +4644,7 @@ index 2e623ef9be036ea467e9e41817c2eced018f8f93..0715e070c727fc26064f6602e9bad3b2
if (i <= 0) {
return this.locZ();
} else {
@@ -516,7 +634,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -517,7 +635,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
}
public static AttributeProvider.Builder eK() {
@@ -4653,7 +4653,7 @@ index 2e623ef9be036ea467e9e41817c2eced018f8f93..0715e070c727fc26064f6602e9bad3b2
}
public int getInvul() {
@@ -528,11 +646,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -529,11 +647,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
}
public int getHeadTarget(int i) {
@@ -4947,7 +4947,7 @@ index 0000000000000000000000000000000000000000..44929182dfd7ad847d9657c324f440cb
+ }
+}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 7bc9cd04a3272179db89340a5a16d35ca8580c99..23dc7bcdcccce2e3255e40ed5d1711045f7668eb 100644
index 9368578a136157496f6cc60f7f01c5d28eff115e..bacb0e7c421a14a1dae57b7824c9d55ed0f39517 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2307,6 +2307,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -6372,10 +6372,10 @@ index 744e6351c58e5aa4a0c668f2ff1adb76a3dc0822..a3b810556e306bc2be65c7811cfa7806
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index ee325757c79d3dc6db6bcc80c32a371e064ef24d..fefac469e4c8b803cd8e8c104103fad586ff2998 100644
index 82e36ba35c0bd4d5b3e13281bad1a0664c25c6e0..c4d0082bb0d310ad16de36df03dd99225c5cadb0 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -527,6 +527,18 @@ public class CraftEventFactory {
@@ -528,6 +528,18 @@ public class CraftEventFactory {
}
craftServer.getPluginManager().callEvent(event);
@@ -6394,7 +6394,7 @@ index ee325757c79d3dc6db6bcc80c32a371e064ef24d..fefac469e4c8b803cd8e8c104103fad5
return event;
}
@@ -927,6 +939,7 @@ public class CraftEventFactory {
@@ -928,6 +940,7 @@ public class CraftEventFactory {
damageCause = DamageCause.ENTITY_EXPLOSION;
}
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions);
@@ -6402,7 +6402,7 @@ index ee325757c79d3dc6db6bcc80c32a371e064ef24d..fefac469e4c8b803cd8e8c104103fad5
}
event.setCancelled(cancelled);
@@ -1011,6 +1024,7 @@ public class CraftEventFactory {
@@ -1012,6 +1025,7 @@ public class CraftEventFactory {
if (!event.isCancelled()) {
event.getEntity().setLastDamageCause(event);
}
@@ -6410,7 +6410,7 @@ index ee325757c79d3dc6db6bcc80c32a371e064ef24d..fefac469e4c8b803cd8e8c104103fad5
return event;
}
@@ -1060,6 +1074,7 @@ public class CraftEventFactory {
@@ -1061,6 +1075,7 @@ public class CraftEventFactory {
EntityDamageEvent event;
if (damager != null) {
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);