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

269/273

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-08 12:14:02 -04:00
parent 17c72b537c
commit 91333745cd
84 changed files with 767 additions and 629 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0005-Ridables.patch
View File

@@ -22,7 +22,7 @@ index 153451ecd5b3c8e8ecb2d5ec91ccd582d4300899..56536c39bccfe097f8227c74a0d16799
super(x, y, z);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index ac70a4e739d8d0de09e27dcbf463a41ef56a2a9f..8184fcc7c2ec8e3fdfeb7d089860e7aa9c17ac4e 100644
index 7c7d98d889fe799990b1bb5c416be50719c21194..50cbdd0e38b61a8290d6689d5fb9c7d13285ec34 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1531,6 +1531,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -34,7 +34,7 @@ index ac70a4e739d8d0de09e27dcbf463a41ef56a2a9f..8184fcc7c2ec8e3fdfeb7d089860e7aa
this.profiler.push(() -> {
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 31fadaf364bf52018132df5ea721e0303ba5b65a..805025d7b446110a6949635a7064d05fb51638fd 100644
index 443ef9d81e769c26ebd5a7d72078ed0f43306a7e..f678861adc54cb00c9e2b7695c20f0e0f44bc7a6 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -216,6 +216,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -79,10 +79,10 @@ index a7bc4eefd73337bfabb84032cd98aba42f5870fd..076c482e6844f6a188267556cd8fbcc5
if ((entity instanceof Bucketable && entity instanceof LivingEntity && 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 ClientboundAddEntityPacket(entity));
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 8c74d436f3f5ffa47ab8991035339c4206df8c43..8f8740b40a37e91eedc3496985ba0d2964cbafe5 100644
index 4ac33be263c3380a1ccc01affe3e20d46badd46e..4b01ef01efe128cdeac548c592f62d72c9e0169e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -320,7 +320,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -356,7 +356,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
private final Set<String> tags;
private final double[] pistonDeltas;
private long pistonDeltasGameTime;
@@ -91,7 +91,7 @@ index 8c74d436f3f5ffa47ab8991035339c4206df8c43..8f8740b40a37e91eedc3496985ba0d29
private float eyeHeight;
public boolean isInPowderSnow;
public boolean wasInPowderSnow;
@@ -2687,6 +2687,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2723,6 +2723,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.passengers = ImmutableList.copyOf(list);
}
@@ -104,7 +104,7 @@ index 8c74d436f3f5ffa47ab8991035339c4206df8c43..8f8740b40a37e91eedc3496985ba0d29
}
return true; // CraftBukkit
}
@@ -2727,6 +2733,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2763,6 +2769,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return false;
}
// Spigot end
@@ -119,7 +119,7 @@ index 8c74d436f3f5ffa47ab8991035339c4206df8c43..8f8740b40a37e91eedc3496985ba0d29
if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
this.passengers = ImmutableList.of();
} else {
@@ -4395,4 +4409,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4431,4 +4445,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
}
// Paper end
@@ -818,7 +818,7 @@ index bd048cc30046f19f9eee89c6ba45d0816a160e67..2c6e1a970d8922047a186fc7eb82abd7
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
index 4e42bcb48c75c816e89e652c898242a9bd8c9d5a..dd59f83fd6adff8d1ade76aac6f3563bfbea15b1 100644
index ab86bfdaebe9b8791f0cfa6e0c61f80c8f891a93..cc73dffbeb8a118de2b913c6f9d40c61f94dabbd 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
@@ -95,6 +95,31 @@ public class Cat extends TamableAnimal {