OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-13 19:28:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge in changes.

Browse source
This commit is contained in:
md_5 2015-01-16 14:58:23 +11:00
parent d04f8d3c65
commit 001a3a2e20
1 changed files with 2 additions and 2 deletions

4
CraftBukkit-Patches/0012-Spigot-Timings.patch
View file

@ -174,8 +174,8 @@ diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/jav
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -0,0 +0,0 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageModifier; @@ -0,0 +0,0 @@ import org.bukkit.event.entity.EntityRegainHealthEvent;
import org.bukkit.event.entity.EntityRegainHealthEvent; import org.bukkit.event.vehicle.VehicleExitEvent;
// CraftBukkit end // CraftBukkit end
+import org.bukkit.craftbukkit.SpigotTimings; // Spigot +import org.bukkit.craftbukkit.SpigotTimings; // Spigot