Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 11:06:29 +01:00
Code Issues Projects Releases Wiki Activity

Rebuild patches.

Browse Source
This commit is contained in:
md_5 2016-03-16 07:14:49 +11:00 committed by Zach Brown
parent a4c39eb681
commit f6fe337ed2
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0032-Entity-Mount-and-Dismount-Events.patch
View File

@ -1,14 +1,14 @@
From a18925d947c5794b7c6434eb628095e91feeb368 Mon Sep 17 00:00:00 2001 From 10154dcc951a95851fbbcf02976a9fc6eca2643b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Sat, 27 Feb 2016 10:07:58 +1100 Date: Sat, 27 Feb 2016 10:07:58 +1100
Subject: [PATCH] Entity Mount and Dismount Events Subject: [PATCH] Entity Mount and Dismount Events
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 1817e6d..e6aa217 100644 index 280ceb8..1104a04 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1679,6 +1679,13 @@ public abstract class Entity implements ICommandListener { @@ -1681,6 +1681,13 @@ public abstract class Entity implements ICommandListener {
} }
} }
// CraftBukkit end // CraftBukkit end
@ -22,7 +22,7 @@ index 1817e6d..e6aa217 100644
if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.bt() instanceof EntityHuman)) { if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.bt() instanceof EntityHuman)) {
this.passengers.add(0, entity); this.passengers.add(0, entity);
} else { } else {
@@ -1708,6 +1715,7 @@ public abstract class Entity implements ICommandListener { @@ -1710,6 +1717,7 @@ public abstract class Entity implements ICommandListener {
} }
} }
// CraftBukkit end // CraftBukkit end

12
CraftBukkit-Patches/0110-Add-damager-to-the-unhandled-error.patch
View File

@ -1,14 +1,14 @@
From 5c3328985bd5f3963514df632ad65dc08dcdd704 Mon Sep 17 00:00:00 2001 From 5497c0768aacaa2d1840790d436b55c4bd9ed379 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org> From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Thu, 26 Jun 2014 23:42:52 +0100 Date: Thu, 26 Jun 2014 23:42:52 +0100
Subject: [PATCH] Add damager to the unhandled error Subject: [PATCH] Add damager to the unhandled error
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 131792b..5083875 100644 index 0abfc60..0e072fe 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -185,7 +185,7 @@ public class CraftEventFactory { @@ -188,7 +188,7 @@ public class CraftEventFactory {
*/ */
public static PlayerInteractEvent callPlayerInteractEvent(EntityHuman who, Action action, ItemStack itemstack, EnumHand hand) { public static PlayerInteractEvent callPlayerInteractEvent(EntityHuman who, Action action, ItemStack itemstack, EnumHand hand) {
if (action != Action.LEFT_CLICK_AIR && action != Action.RIGHT_CLICK_AIR) { if (action != Action.LEFT_CLICK_AIR && action != Action.RIGHT_CLICK_AIR) {
@ -17,7 +17,7 @@ index 131792b..5083875 100644
} }
return callPlayerInteractEvent(who, action, new BlockPosition(0, 256, 0), EnumDirection.SOUTH, itemstack, hand); return callPlayerInteractEvent(who, action, new BlockPosition(0, 256, 0), EnumDirection.SOUTH, itemstack, hand);
} }
@@ -483,7 +483,7 @@ public class CraftEventFactory { @@ -486,7 +486,7 @@ public class CraftEventFactory {
if (source == DamageSource.CACTUS) { if (source == DamageSource.CACTUS) {
cause = DamageCause.CONTACT; cause = DamageCause.CONTACT;
} else { } else {
@ -26,7 +26,7 @@ index 131792b..5083875 100644
} }
EntityDamageEvent event = callEvent(new EntityDamageByBlockEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions)); EntityDamageEvent event = callEvent(new EntityDamageByBlockEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions));
if (!event.isCancelled()) { if (!event.isCancelled()) {
@@ -503,7 +503,7 @@ public class CraftEventFactory { @@ -506,7 +506,7 @@ public class CraftEventFactory {
} else if (source == DamageSource.DRAGON_BREATH) { } else if (source == DamageSource.DRAGON_BREATH) {
cause = DamageCause.DRAGON_BREATH; cause = DamageCause.DRAGON_BREATH;
} else { } else {
@ -35,7 +35,7 @@ index 131792b..5083875 100644
} }
EntityDamageEvent event = callEvent(new EntityDamageByEntityEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions)); EntityDamageEvent event = callEvent(new EntityDamageByEntityEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions));
if (!event.isCancelled()) { if (!event.isCancelled()) {
@@ -543,7 +543,7 @@ public class CraftEventFactory { @@ -546,7 +546,7 @@ public class CraftEventFactory {
return callEntityDamageEvent(null, entity, cause, modifiers, modifierFunctions); return callEntityDamageEvent(null, entity, cause, modifiers, modifierFunctions);
} }

6
CraftBukkit-Patches/0149-Implement-SpawnerSpawnEvent.patch
View File

@ -1,4 +1,4 @@
From 3915e4f8fec3e645a5a878c319dd15ff836a3528 Mon Sep 17 00:00:00 2001 From 4a43a9f06645e1ac3e219ee711084a95e846ed2c Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Thu, 3 Mar 2016 19:45:46 +1100 Date: Thu, 3 Mar 2016 19:45:46 +1100
Subject: [PATCH] Implement SpawnerSpawnEvent. Subject: [PATCH] Implement SpawnerSpawnEvent.
@ -19,10 +19,10 @@ index efe792b..a7903a2 100644
ChunkRegionLoader.a(entity, world, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit ChunkRegionLoader.a(entity, world, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
world.triggerEffect(2004, blockposition, 0); world.triggerEffect(2004, blockposition, 0);
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 3b7243b..f99b01f 100644 index 0e072fe..f330757 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -985,6 +985,21 @@ public class CraftEventFactory { @@ -988,6 +988,21 @@ public class CraftEventFactory {
return event; return event;
} }