Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-04 07:17:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix patch conflicts

Browse Source
This commit is contained in:
md_5 2016-03-12 20:59:15 +11:00
parent b7d6f29245
commit bd4ee28e5c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CraftBukkit-Patches/0010-Spigot-Timings.patch
View File

@ -464,7 +464,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess { @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
if (this.isLoaded(blockposition) && this.N.a(blockposition)) { if (this.isLoaded(blockposition) && this.N.a(blockposition)) {
try { try {
this.methodProfiler.a(tileentity.getClass().getSimpleName()); this.methodProfiler.a(""/*tileentity.getClass().getSimpleName()*/); // CraftBukkit: SPIGOT-1900
+ tileentity.tickTimer.startTiming(); // Spigot + tileentity.tickTimer.startTiming(); // Spigot
((ITickable) tileentity).c(); ((ITickable) tileentity).c();
this.methodProfiler.b(); this.methodProfiler.b();

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

@ -23,10 +23,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- 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
@@ -0,0 +0,0 @@ public class CraftEventFactory { @@ -0,0 +0,0 @@ public class CraftEventFactory {
event.getInventory().setItem(2, event.getResult());
return event; return event;
} }
+
+ /** + /**
+ * Mob spawner event. + * Mob spawner event.
+ */ + */
@ -41,5 +40,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ entity.getServer().getPluginManager().callEvent(event); + entity.getServer().getPluginManager().callEvent(event);
+ return event; + return event;
+ } + }
} +
public static EntityToggleGlideEvent callToggleGlideEvent(EntityLiving entity, boolean gliding) {
EntityToggleGlideEvent event = new EntityToggleGlideEvent((LivingEntity) entity.getBukkitEntity(), gliding);
entity.world.getServer().getPluginManager().callEvent(event);
-- --