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

update paper

Browse Source
This commit is contained in:
BillyGalbreath
2021-06-16 18:03:37 -05:00
parent d7fdc8ace3
commit 6df0286ff0
7 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0003-Ridables.patch
View File

@@ -46,7 +46,7 @@ index fe6d8b93f5685b611f1f2fe6ac28a0b718e198cc..900b30c9ba0d7b9e0b19c23c1eb5b75d
return new Throwable(entity + " Added to world at " + new java.util.Date());
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index b4055c6de62c22ba8ee8384884f9b3fd62eddeb8..84c0c68e327d73e782cd451fc0d209a8b4287b2e 100644
index 5d3269c6912a23aef26d5b155c04c2cd567cefba..35390d245330b7e69daa2a386c6913a719c04a32 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -662,6 +662,15 @@ public class ServerPlayer extends Player {
@@ -86,7 +86,7 @@ index 40d0dac02bb1922483d68f3cdd09a228f66d09f6..8e585ea6a070b2339cf396d70224a0d3
if ((entity instanceof AbstractFish && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
ServerGamePacketListenerImpl.this.send(new ClientboundAddMobPacket((AbstractFish) entity));
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index aaaf5d49972ab608473637dc884dd0c802deaae0..3e2e3038bfe830a50edfee81bc4aa454a42538ec 100644
index cfab75b70b4cf4c95f3a7971c78f6dc42c0d23d0..f6f162b145bffe2d97b48b009641b0437fee5b1d 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -230,7 +230,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -126,7 +126,7 @@ index aaaf5d49972ab608473637dc884dd0c802deaae0..3e2e3038bfe830a50edfee81bc4aa454
if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
this.passengers = ImmutableList.of();
} else {
@@ -3374,6 +3388,29 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -3373,6 +3387,29 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
return SlotAccess.NULL;
}
@@ -156,7 +156,7 @@ index aaaf5d49972ab608473637dc884dd0c802deaae0..3e2e3038bfe830a50edfee81bc4aa454
@Override
public void sendMessage(Component message, UUID sender) {}
@@ -3985,4 +4022,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -3984,4 +4021,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
}
// Paper end
@@ -260,7 +260,7 @@ index 58b36ed797476f3cec78529e09e913ebb791c5e3..e733c1e8f0b180bf1508e4f004124d44
// Paper end
if (!this.level.isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index ecd6ce01f541a2885384dac47095422b86e194fa..9438a6dfee9e3a2a4b781eff63332386fb7d6b13 100644
index 6c603926c0d582b16268fd0888bc685442e0c8cd..4c0a0ac37f59f636947f21acfd3c3b5f0d8e8b0c 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -139,6 +139,8 @@ public abstract class Mob extends LivingEntity {