mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 01:47:42 +01:00
apply paper server patches
This commit is contained in:
@@ -5,7 +5,7 @@ Subject: [PATCH] Ridables
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
index af6420cdf988badaf70e8c075d2ab9b6a4935e88..edc1758f12b36555edb7eaba2ea3bd78118dda93 100644
|
||||
index 6f3f8f6f50437a0d0cec971c9290bc12f3824da8..b829cb03ff78a5ec252e1c7e27740ac489a4bb3d 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
@@ -1345,4 +1345,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
||||
@@ -36,10 +36,10 @@ index af6420cdf988badaf70e8c075d2ab9b6a4935e88..edc1758f12b36555edb7eaba2ea3bd78
|
||||
+ // Purpur end - Ridables
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
index 1d112510093d5eb5117adf16b92dd3411a610a4a..a162440a583801671787163d998d6b9546ef7e61 100644
|
||||
index 437d2add0b901baefee056daf4b5ed8694e8e467..1cc45ebaaac7cc503fb72531d881d7d3e59e2db3 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
@@ -525,6 +525,15 @@ public class CraftEventFactory {
|
||||
@@ -515,6 +515,15 @@ public class CraftEventFactory {
|
||||
}
|
||||
craftServer.getPluginManager().callEvent(event);
|
||||
|
||||
@@ -55,7 +55,7 @@ index 1d112510093d5eb5117adf16b92dd3411a610a4a..a162440a583801671787163d998d6b95
|
||||
return event;
|
||||
}
|
||||
|
||||
@@ -1057,6 +1066,7 @@ public class CraftEventFactory {
|
||||
@@ -1047,6 +1056,7 @@ public class CraftEventFactory {
|
||||
EntityDamageEvent event;
|
||||
if (damager != null) {
|
||||
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, bukkitDamageSource, modifiers, modifierFunctions, critical);
|
||||
|
||||
Reference in New Issue
Block a user