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

fix paperclip bug

Browse Source
This commit is contained in:
Ben
2023-03-18 16:35:47 -04:00
parent d383dbb262
commit 56f5adf79a
19 changed files with 74 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0006-Ridables.patch
View File

@@ -22,12 +22,12 @@ index b37e0ff164a894d2033fb94bbbc2f630a0e66bcd..ac335ec4f70830c7687ac4e0aa2a6cba
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 ce6bb0323bc8f76c6f5d8f906481d037f56fd4b6..14f42f40fd8afbb21882d08a9ab81e5bdef9fb6f 100644
index ac0693f439f063d19ea68d8b216d4ecf10441b15..9fb7e742b91311bf542f533e2a411e9847be7038 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1524,6 +1524,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
ServerLevel worldserver = (ServerLevel) iterator.next();
@@ -1526,6 +1526,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper
worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
+ worldserver.hasRidableMoveEvent = org.purpurmc.purpur.event.entity.RidableMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Purpur
@@ -2445,7 +2445,7 @@ index cfa904d42734d0fb0c1ed8b18f4d8bc131027962..a9805129f0aaba5f0c2751d463019844
this.level.getProfiler().pop();
this.level.getProfiler().push("goatActivityUpdate");
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
index f9496f757bcf7000fab1f16386e775d54d96e47a..f404bee067c7666fd4cf4818c9b093d54a43d5de 100644
index 47cd69f91bbc2e2be9ec970674adc522e21593c8..2d298960afe61ed2b73ca72908849879408738b9 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
@@ -144,12 +144,22 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@@ -2695,18 +2695,18 @@ index e2935115c8d41af1d623da4f0d4f73de80386129..e9f1d53599168c4c4b44a14b44514302
}
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
index 5719172a31f005ce419f365011d53712a9b2820f..64a8318d95455810cb096059bcfd8e64d0f5d6f6 100644
index c6949c7ec0766bda07324a6f004b29cbd37d0f1f..d79c55668c2077869e08a77a03aeffefefafd788 100644
--- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
+++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
@@ -273,7 +273,7 @@ public class Sniffer extends Animal {
@@ -296,7 +296,7 @@ public class Sniffer extends Animal {
}
@Override
- protected void jumpFromGround() {
+ public void jumpFromGround() { // Purpur - protected -> public
super.jumpFromGround();
double d = this.moveControl.getSpeedModifier();
if (d > 0.0D) {
double d0 = this.moveControl.getSpeedModifier();
diff --git a/src/main/java/net/minecraft/world/entity/boss/EnderDragonPart.java b/src/main/java/net/minecraft/world/entity/boss/EnderDragonPart.java
index de84a00ce2d2b7c654b08164489624e124568346..998c72513df1dcd2b1316b320b3d5e7ca8e69fd4 100644
--- a/src/main/java/net/minecraft/world/entity/boss/EnderDragonPart.java
@@ -5127,7 +5127,7 @@ index 57a0dbb23a32123d30c3b3572f4d129be9d97847..fa6938626c64ed17a2f56739d5801494
+ // 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 f60e94560b89a3c6ed1ad0f8bc636d58bf48d222..fb1555641047175060f381bf797c4a6fce75837a 100644
index 7131cdb839df47bf3d2c2bf8476fd7a2ecebb3ba..e973f48e21a3c4544683806421a3316ac4991efa 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -544,6 +544,15 @@ public class CraftEventFactory {
@@ -5146,7 +5146,7 @@ index f60e94560b89a3c6ed1ad0f8bc636d58bf48d222..fb1555641047175060f381bf797c4a6f
return event;
}
@@ -982,6 +991,7 @@ public class CraftEventFactory {
@@ -981,6 +990,7 @@ public class CraftEventFactory {
damageCause = DamageCause.ENTITY_EXPLOSION;
}
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions, source.isCritical()); // Paper - add critical damage API
@@ -5154,7 +5154,7 @@ index f60e94560b89a3c6ed1ad0f8bc636d58bf48d222..fb1555641047175060f381bf797c4a6f
}
event.setCancelled(cancelled);
@@ -1088,6 +1098,7 @@ public class CraftEventFactory {
@@ -1087,6 +1097,7 @@ public class CraftEventFactory {
} else {
entity.lastDamageCancelled = true; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled
}
@@ -5162,7 +5162,7 @@ index f60e94560b89a3c6ed1ad0f8bc636d58bf48d222..fb1555641047175060f381bf797c4a6f
return event;
}
@@ -1147,6 +1158,7 @@ public class CraftEventFactory {
@@ -1146,6 +1157,7 @@ public class CraftEventFactory {
EntityDamageEvent event;
if (damager != null) {
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions, critical); // Paper - add critical damage API