3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-19 04:50:06 +01:00

Add ProjectileCollideEvent

Base our vanish changes on top of that event.
Dieser Commit ist enthalten in:
Zach Brown 2016-12-16 22:13:45 -06:00
Ursprung bf86516043
Commit 0728696e06
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: CC9DA35FC5450B76
182 geänderte Dateien mit 596 neuen und 420 gelöschten Zeilen

Datei anzeigen

@ -0,0 +1,77 @@
From 40cc96eda623cddf95322ad4ca1d0ae665625ba1 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Fri, 16 Dec 2016 21:25:39 -0600
Subject: [PATCH] Add ProjectileCollideEvent
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
new file mode 100644
index 0000000..f42e985
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
@@ -0,0 +1,62 @@
+package com.destroystokyo.paper.event.entity;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Projectile;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.entity.EntityEvent;
+
+/**
+ * Called when an projectile collides with an entity
+ * <p>
+ * This event is called <b>before</b> {@link org.bukkit.event.entity.EntityDamageByEntityEvent}, and cancelling it will allow the projectile to continue flying
+ */
+public class ProjectileCollideEvent extends EntityEvent implements Cancellable {
+ private final Entity collidedWith;
+
+ /**
+ * Get the entity the projectile collided with
+ *
+ * @return the entity collided with
+ */
+ public Entity getCollidedWith() {
+ return collidedWith;
+ }
+
+ public ProjectileCollideEvent(Projectile what, Entity collidedWith) {
+ super(what);
+ this.collidedWith = collidedWith;
+ }
+
+ /**
+ * Get the projectile that collided
+ *
+ * @return the projectile that collided
+ */
+ public Projectile getEntity() {
+ return (Projectile) super.getEntity();
+ }
+
+ private static final HandlerList handlerList = new HandlerList();
+
+ public static HandlerList getHandlerList() {
+ return handlerList;
+ }
+
+ @Override
+ public HandlerList getHandlers() {
+ return handlerList;
+ }
+
+ private boolean cancelled = false;
+
+ @Override
+ public boolean isCancelled() {
+ return cancelled;
+ }
+
+ @Override
+ public void setCancelled(boolean cancel) {
+ this.cancelled = cancel;
+ }
+}
--
2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From e460bd961a9d020f64b2e0cb59b9e0991e1361e9 Mon Sep 17 00:00:00 2001 From ba20e837e38f468c105978d3289fe3c5b31fdea8 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 12:45:11 -0600 Date: Tue, 1 Mar 2016 12:45:11 -0600
Subject: [PATCH] Configurable squid spawn ranges Subject: [PATCH] Configurable squid spawn ranges
@ -35,5 +35,5 @@ index 9f88e44..56f7ca8 100644
public void b(float f, float f1, float f2) { public void b(float f, float f1, float f2) {
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,99 +0,0 @@
From c41f57a6a44ef40c5010c2fadaa6e583183c7995 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 21:20:21 -0600
Subject: [PATCH] Vanished players don't have rights
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index ca84d92..287566c 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -190,6 +190,14 @@ public abstract class EntityArrow extends Entity implements IProjectile {
}
}
+ // Paper start - Allow arrows to fly through vanished players the shooter can't see
+ if (movingobjectposition != null && movingobjectposition.entity instanceof EntityPlayer && shooter != null && shooter instanceof EntityPlayer) {
+ if (!((EntityPlayer) shooter).getBukkitEntity().canSee(((EntityPlayer) movingobjectposition.entity).getBukkitEntity())) {
+ movingobjectposition = null;
+ }
+ }
+ // Paper end
+
if (movingobjectposition != null) {
this.a(movingobjectposition);
}
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
index bfbae25..c8837be 100644
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -224,6 +224,15 @@ public class EntityFishingHook extends Entity {
vec3d = new Vec3D(this.locX, this.locY, this.locZ);
vec3d1 = new Vec3D(this.locX + this.motX, this.locY + this.motY, this.locZ + this.motZ);
+
+ // Paper start - Allow fishing hooks to fly through vanished players the shooter can't see
+ if (movingobjectposition != null && movingobjectposition.entity instanceof EntityPlayer && owner != null && owner instanceof EntityPlayer) {
+ if (!((EntityPlayer) owner).getBukkitEntity().canSee(((EntityPlayer) movingobjectposition.entity).getBukkitEntity())) {
+ movingobjectposition = null;
+ }
+ }
+ // Paper end
+
if (movingobjectposition != null) {
vec3d1 = new Vec3D(movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z);
}
diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
index 40ac335..3d5548f 100644
--- a/src/main/java/net/minecraft/server/EntityProjectile.java
+++ b/src/main/java/net/minecraft/server/EntityProjectile.java
@@ -160,6 +160,14 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
movingobjectposition = new MovingObjectPosition(entity);
}
+ // Paper start - Allow projectiles to fly through vanished players the shooter can't see
+ if (movingobjectposition != null && movingobjectposition.entity instanceof EntityPlayer && shooter != null && shooter instanceof EntityPlayer) {
+ if (!((EntityPlayer) shooter).getBukkitEntity().canSee(((EntityPlayer) movingobjectposition.entity).getBukkitEntity())) {
+ movingobjectposition = null;
+ }
+ }
+ // Paper end
+
if (movingobjectposition != null) {
if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.PORTAL) {
this.e(movingobjectposition.a());
diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
index eb32871..58ec8b5 100644
--- a/src/main/java/net/minecraft/server/ItemBlock.java
+++ b/src/main/java/net/minecraft/server/ItemBlock.java
@@ -20,7 +20,7 @@ public class ItemBlock extends Item {
ItemStack itemstack = entityhuman.b(enumhand);
- if (!itemstack.isEmpty() && entityhuman.a(blockposition, enumdirection, itemstack) && world.a(this.a, blockposition, false, enumdirection, (Entity) null)) {
+ if (!itemstack.isEmpty() && entityhuman.a(blockposition, enumdirection, itemstack) && world.a(this.a, blockposition, false, enumdirection, entityhuman)) { // Paper - Pass entityhuman instead of null
int i = this.filterData(itemstack.getData());
IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 78b5a3c..2a38b1c 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1725,6 +1725,14 @@ public abstract class World implements IBlockAccess {
for (int i = 0; i < list.size(); ++i) {
Entity entity1 = (Entity) list.get(i);
+ // Paper start - Allow block placement if the placer cannot see the vanished blocker
+ if (entity instanceof EntityPlayer && entity1 instanceof EntityPlayer) {
+ if (!((EntityPlayer) entity).getBukkitEntity().canSee(((EntityPlayer) entity1).getBukkitEntity())) {
+ continue;
+ }
+ }
+ // Paper end
+
if (!entity1.dead && entity1.i && entity1 != entity && (entity == null || entity1.x(entity))) {
return false;
}
--
2.10.2.windows.1

Datei anzeigen

@ -1,4 +1,4 @@
From 4247f8b4fd518e49f1bb0e6a22a2a3c1bd4aed29 Mon Sep 17 00:00:00 2001 From fb33837750d4fdd9577d1baea535a594d1b3e899 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 13:02:51 -0600 Date: Tue, 1 Mar 2016 13:02:51 -0600
Subject: [PATCH] Configurable cactus and reed natural growth heights Subject: [PATCH] Configurable cactus and reed natural growth heights
@ -23,7 +23,7 @@ index c74c8a7..8d9c322 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
index 4368731..fec2f0a 100644 index 3f579fb..a69a707 100644
--- a/src/main/java/net/minecraft/server/BlockCactus.java --- a/src/main/java/net/minecraft/server/BlockCactus.java
+++ b/src/main/java/net/minecraft/server/BlockCactus.java +++ b/src/main/java/net/minecraft/server/BlockCactus.java
@@ -28,7 +28,7 @@ public class BlockCactus extends Block { @@ -28,7 +28,7 @@ public class BlockCactus extends Block {
@ -36,7 +36,7 @@ index 4368731..fec2f0a 100644
if (j >= (byte) range(3, ((100.0F / world.spigotConfig.cactusModifier) * 15) + 0.5F, 15)) { // Spigot if (j >= (byte) range(3, ((100.0F / world.spigotConfig.cactusModifier) * 15) + 0.5F, 15)) { // Spigot
diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
index 4bb63ff..2e565d3 100644 index 84014b1..9d1af2a 100644
--- a/src/main/java/net/minecraft/server/BlockReed.java --- a/src/main/java/net/minecraft/server/BlockReed.java
+++ b/src/main/java/net/minecraft/server/BlockReed.java +++ b/src/main/java/net/minecraft/server/BlockReed.java
@@ -28,7 +28,7 @@ public class BlockReed extends Block { @@ -28,7 +28,7 @@ public class BlockReed extends Block {
@ -49,5 +49,5 @@ index 4bb63ff..2e565d3 100644
if (j >= (byte) range(3, ((100.0F / world.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot if (j >= (byte) range(3, ((100.0F / world.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot
-- --
2.8.3 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 4913d3438af4ad594d6c8022d5e343ec0f03bcc7 Mon Sep 17 00:00:00 2001 From 9f388589db8284372e23b471d7139f5321c51970 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 13:09:16 -0600 Date: Tue, 1 Mar 2016 13:09:16 -0600
Subject: [PATCH] Configurable baby zombie movement speed Subject: [PATCH] Configurable baby zombie movement speed
@ -45,5 +45,5 @@ index 497d559..897882c 100644
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From d1e7170b9d3d73895ed986db6751a0897443c488 Mon Sep 17 00:00:00 2001 From 468154ec473f5c5111620f0c68e1f3ea8076128b Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 13:14:11 -0600 Date: Tue, 1 Mar 2016 13:14:11 -0600
Subject: [PATCH] Configurable fishing time ranges Subject: [PATCH] Configurable fishing time ranges
@ -22,10 +22,10 @@ index ae3d0e4..7b2b95d 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
index 91702f2..e0475ce 100644 index 0eb6207..96c3d66 100644
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -380,7 +380,7 @@ public class EntityFishingHook extends Entity { @@ -371,7 +371,7 @@ public class EntityFishingHook extends Entity {
this.at = MathHelper.nextInt(this.random, 20, 80); this.at = MathHelper.nextInt(this.random, 20, 80);
} }
} else { } else {
@ -35,5 +35,5 @@ index 91702f2..e0475ce 100644
} }
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 910207ffbebc1c4e2b75815e1be168f7379a0233 Mon Sep 17 00:00:00 2001 From 6234b90aa3d52cd7c4fb7d32e32a6513bb871040 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 13:24:16 -0600 Date: Tue, 1 Mar 2016 13:24:16 -0600
Subject: [PATCH] Allow nerfed mobs to jump Subject: [PATCH] Allow nerfed mobs to jump
@ -57,5 +57,5 @@ index e3b4058..c16ad2c 100644
((Navigation) entityinsentient.getNavigation()).c(true); ((Navigation) entityinsentient.getNavigation()).c(true);
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From c44fba6cdb89433a896e92ea32ab56a25ab58a20 Mon Sep 17 00:00:00 2001 From 9f15156e130d9728cb00e3e9960e6a5282b1e334 Mon Sep 17 00:00:00 2001
From: Suddenly <suddenly@suddenly.coffee> From: Suddenly <suddenly@suddenly.coffee>
Date: Tue, 1 Mar 2016 13:51:54 -0600 Date: Tue, 1 Mar 2016 13:51:54 -0600
Subject: [PATCH] Add configurable despawn distances for living entities Subject: [PATCH] Add configurable despawn distances for living entities
@ -51,5 +51,5 @@ index 50b29c0..3f7eae1 100644
} }
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From c445404785a2d57072675ac79855742923a32331 Mon Sep 17 00:00:00 2001 From 25c9e1be46572bac02d6ab4726a60d5e9948d3bc Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 3 Mar 2016 03:53:43 -0600 Date: Thu, 3 Mar 2016 03:53:43 -0600
Subject: [PATCH] Allow for toggling of spawn chunks Subject: [PATCH] Allow for toggling of spawn chunks
@ -20,7 +20,7 @@ index 92f38a4..c2c488a 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 2a38b1c..52171a3 100644 index 78b5a3c..69aeaca 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -198,6 +198,7 @@ public abstract class World implements IBlockAccess { @@ -198,6 +198,7 @@ public abstract class World implements IBlockAccess {
@ -32,5 +32,5 @@ index 2a38b1c..52171a3 100644
this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime); this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 93b9b2bae96d5f54b99cfd0765ec3ce98b413cbd Mon Sep 17 00:00:00 2001 From 3de36042c25fa09c19415aa1690d56c108edd328 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Tue, 1 Mar 2016 14:14:15 -0600 Date: Tue, 1 Mar 2016 14:14:15 -0600
Subject: [PATCH] Drop falling block and tnt entities at the specified height Subject: [PATCH] Drop falling block and tnt entities at the specified height
@ -63,5 +63,5 @@ index 0fbdbd6..fd07356 100644
this.motY *= 0.9800000190734863D; this.motY *= 0.9800000190734863D;
this.motZ *= 0.9800000190734863D; this.motZ *= 0.9800000190734863D;
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,11 +1,11 @@
From 1c5ada35bc900cbdd76d751faa0fb1fdeec7a7fd Mon Sep 17 00:00:00 2001 From 27e763ca619d7797d124edb43955e8c424c23ba7 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Tue, 1 Mar 2016 14:27:13 -0600 Date: Tue, 1 Mar 2016 14:27:13 -0600
Subject: [PATCH] Configurable speed for water flowing over lava Subject: [PATCH] Configurable speed for water flowing over lava
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index d44fdaea6..06d152762 100644 index d44fdae..06d1527 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -137,4 +137,10 @@ public class PaperWorldConfig { @@ -137,4 +137,10 @@ public class PaperWorldConfig {
@ -20,7 +20,7 @@ index d44fdaea6..06d152762 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
index c9294a58d..f4ac7bafa 100644 index c9294a5..f4ac7ba 100644
--- a/src/main/java/net/minecraft/server/BlockFlowing.java --- a/src/main/java/net/minecraft/server/BlockFlowing.java
+++ b/src/main/java/net/minecraft/server/BlockFlowing.java +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
@@ -30,7 +30,7 @@ public class BlockFlowing extends BlockFluids { @@ -30,7 +30,7 @@ public class BlockFlowing extends BlockFluids {
@ -57,5 +57,5 @@ index c9294a58d..f4ac7bafa 100644
+ } + }
} }
-- --
2.11.0.windows.1 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 3059ae61c794fce3c54797e2ac440bf78765a779 Mon Sep 17 00:00:00 2001 From cb75f26bfce777e1f28853aa91d6230531242425 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 14:32:43 -0600 Date: Tue, 1 Mar 2016 14:32:43 -0600
Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@ -33,7 +33,7 @@ index 81a69e8..c8c6959 100644
public CrashReport b(CrashReport crashreport) { public CrashReport b(CrashReport crashreport) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0ddbd2f..9113be9 100644 index 761c8e4..3f13c86 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -134,7 +134,7 @@ import net.md_5.bungee.api.chat.BaseComponent; @@ -134,7 +134,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
@ -80,5 +80,5 @@ index 94a3d42..3ed983c 100644
log.log( Level.SEVERE, "------------------------------" ); log.log( Level.SEVERE, "------------------------------" );
// //
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 8511153bd8600f68521b299b00e1ce03e1d6992b Mon Sep 17 00:00:00 2001 From 4f369a29323103c01bc354522f86e0a7b13ef229 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 1 Mar 2016 14:47:52 -0600 Date: Tue, 1 Mar 2016 14:47:52 -0600
Subject: [PATCH] Player affects spawning API Subject: [PATCH] Player affects spawning API
@ -57,10 +57,10 @@ index bec25e4..30aacc9 100644
j = MathHelper.floor(entityhuman.locZ / 16.0D); j = MathHelper.floor(entityhuman.locZ / 16.0D);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 52171a3..3d70c50 100644 index 69aeaca..c8ba375 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -2750,7 +2750,7 @@ public abstract class World implements IBlockAccess { @@ -2742,7 +2742,7 @@ public abstract class World implements IBlockAccess {
for (int i = 0; i < this.players.size(); ++i) { for (int i = 0; i < this.players.size(); ++i) {
EntityHuman entityhuman = (EntityHuman) this.players.get(i); EntityHuman entityhuman = (EntityHuman) this.players.get(i);

Datei anzeigen

@ -1,4 +1,4 @@
From 1764a472a3a6830464ebe4136e6c8ebb9b3b4b1f Mon Sep 17 00:00:00 2001 From ee38e5a5f229f8adad1383883452f365de3e1b6b Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 14:54:32 -0600 Date: Tue, 1 Mar 2016 14:54:32 -0600
Subject: [PATCH] Metrics Subject: [PATCH] Metrics
@ -18,5 +18,5 @@ index a5fd59d..680283c 100644
String pluginVersion = (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown"; String pluginVersion = (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown";
String serverVersion = Bukkit.getVersion(); String serverVersion = Bukkit.getVersion();
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 6fa172fd0c691f25c4f2bde7223513232b35ab32 Mon Sep 17 00:00:00 2001 From 6b1a51ebeb36d4d5f2b9e0a8816a4d7b3a7ddc02 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Tue, 1 Mar 2016 15:08:03 -0600 Date: Tue, 1 Mar 2016 15:08:03 -0600
Subject: [PATCH] Remove invalid mob spawner tile entities Subject: [PATCH] Remove invalid mob spawner tile entities
@ -20,5 +20,5 @@ index bd3b160..1c0108e 100644
System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ() System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ()
+ " (" + org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(getBlockData(blockposition).getBlock()) + ") where there was no entity tile!"); + " (" + org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(getBlockData(blockposition).getBlock()) + ") where there was no entity tile!");
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From f2bbe33ed075142f13f0c6d51b67f5e2d62f7a31 Mon Sep 17 00:00:00 2001 From 801f5693fe5379447940a29868132cd8f973ece1 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 22:01:19 -0600 Date: Tue, 1 Mar 2016 22:01:19 -0600
Subject: [PATCH] Optimize TileEntity Ticking Subject: [PATCH] Optimize TileEntity Ticking
@ -186,5 +186,5 @@ index 3d61c2d..586ceaa 100644
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 98a06688336bb1b699ef02030dd393fff7fe597f Mon Sep 17 00:00:00 2001 From 1381fa6bedb54329d4d3206c466ce6dfe42c8c17 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 1 Mar 2016 23:09:29 -0600 Date: Tue, 1 Mar 2016 23:09:29 -0600
Subject: [PATCH] Further improve server tick loop Subject: [PATCH] Further improve server tick loop
@ -148,7 +148,7 @@ index c8c6959..127d11c 100644
} }
lastTick = curTime; lastTick = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 9113be9..c1149a6 100644 index 3f13c86..7e7be86 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1726,6 +1726,17 @@ public final class CraftServer implements Server { @@ -1726,6 +1726,17 @@ public final class CraftServer implements Server {
@ -211,5 +211,5 @@ index be2e31d..6d21c32 100644
return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString() return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString()
+ ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 ); + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 );
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,11 +1,11 @@
From fcbd429b4f06aa4a99c8fd9725b460cc8562b26c Mon Sep 17 00:00:00 2001 From 33fa09857751646136abb45542df2edc1238be2a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 23:12:03 -0600 Date: Tue, 1 Mar 2016 23:12:03 -0600
Subject: [PATCH] Only refresh abilities if needed Subject: [PATCH] Only refresh abilities if needed
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 54542ee..a9c2677 100644 index 5e9834c..3e4e080 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1173,12 +1173,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1173,12 +1173,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -24,5 +24,5 @@ index 54542ee..a9c2677 100644
@Override @Override
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,11 +1,11 @@
From f9f10699b2f5fcd38c9160971515c6cf5f093db7 Mon Sep 17 00:00:00 2001 From 38018a4a5db0023a7d170ac687428d5549785ae4 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 23:19:01 -0600 Date: Tue, 1 Mar 2016 23:19:01 -0600
Subject: [PATCH] Add async chunk load API Subject: [PATCH] Add async chunk load API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 9a2e9b2..cc15a0b 100644 index a15c129..110f655 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -127,6 +127,26 @@ public class CraftWorld implements World { @@ -127,6 +127,26 @@ public class CraftWorld implements World {

Datei anzeigen

@ -1,4 +1,4 @@
From cb0c2ac1cdfc0d75128d4db894e6bf600a8ff0e9 Mon Sep 17 00:00:00 2001 From 11ba8a856ee1d222a3012b43949ac3e3d15a39f0 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Tue, 1 Mar 2016 23:45:08 -0600 Date: Tue, 1 Mar 2016 23:45:08 -0600
Subject: [PATCH] Entity Origin API Subject: [PATCH] Entity Origin API
@ -89,7 +89,7 @@ index fd07356..25e471d 100644
@Nullable @Nullable
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 3d70c50..eb0483d 100644 index c8ba375..e73c9fb 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1021,6 +1021,12 @@ public abstract class World implements IBlockAccess { @@ -1021,6 +1021,12 @@ public abstract class World implements IBlockAccess {
@ -155,5 +155,5 @@ index c493c9c..93843aa 100644
+ // Paper end + // Paper end
} }
-- --
2.10.2.windows.1 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 7fbd0b2351a7a6e38cf85611cbcb5caa1fc5cbf0 Mon Sep 17 00:00:00 2001 From c594cd00dc7576bf63dab6979473d31ae5b5eb98 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 1 Mar 2016 23:52:34 -0600 Date: Tue, 1 Mar 2016 23:52:34 -0600
Subject: [PATCH] Prevent tile entity and entity crashes Subject: [PATCH] Prevent tile entity and entity crashes
@ -23,7 +23,7 @@ index 0f505ed..1f3e89b 100644
public String a() throws Exception { public String a() throws Exception {
int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock()); int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock());
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 4db969b..20cc5ff 100644 index e73c9fb..804b994 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1467,10 +1467,12 @@ public abstract class World implements IBlockAccess { @@ -1467,10 +1467,12 @@ public abstract class World implements IBlockAccess {
@ -62,5 +62,5 @@ index 4db969b..20cc5ff 100644
// Spigot start // Spigot start
finally { finally {
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 94a01cae0a4766334b1efdb05a4410a02a84a401 Mon Sep 17 00:00:00 2001 From 5b6b3194d535a25d2f22da2bef56abe47f10bcca Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 23:58:50 -0600 Date: Tue, 1 Mar 2016 23:58:50 -0600
Subject: [PATCH] Configurable top of nether void damage Subject: [PATCH] Configurable top of nether void damage
@ -87,5 +87,5 @@ index fdacb6d..ec75bab 100644
int i; int i;
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 44c07ef0621492638973ef6e53b42a04e87c7bee Mon Sep 17 00:00:00 2001 From 026b5acef75a274fa06375125444e828c071d629 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 2 Mar 2016 00:03:55 -0600 Date: Wed, 2 Mar 2016 00:03:55 -0600
Subject: [PATCH] Check online mode before converting and renaming player data Subject: [PATCH] Check online mode before converting and renaming player data
@ -18,5 +18,5 @@ index b6cb918..7c4c599 100644
file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat"); file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
if ( file.exists() ) if ( file.exists() )
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 2a837acc0906c9c21810efbe5aa68b66d4866d3a Mon Sep 17 00:00:00 2001 From 84877410582d951108695a4d3d1d1951645022bb Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 2 Mar 2016 00:32:25 -0600 Date: Wed, 2 Mar 2016 00:32:25 -0600
Subject: [PATCH] Always tick falling blocks Subject: [PATCH] Always tick falling blocks
@ -25,5 +25,5 @@ index 5c2fb00..c411ce8 100644
|| entity instanceof EntityFireworks ) || entity instanceof EntityFireworks )
{ {
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From de8891c221aadfd9a15b896d964d0d41367c5c44 Mon Sep 17 00:00:00 2001 From 30eb1836f00bc0acb416356296137ec1881a4c09 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 00:52:31 -0600 Date: Wed, 2 Mar 2016 00:52:31 -0600
Subject: [PATCH] Lighting Queue Subject: [PATCH] Lighting Queue
@ -222,7 +222,7 @@ index 0000000..2350fe3
+ } + }
+} +}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 20cc5ff..abe11ad 100644 index 804b994..8cb3a98 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -387,7 +387,7 @@ public abstract class World implements IBlockAccess { @@ -387,7 +387,7 @@ public abstract class World implements IBlockAccess {
@ -235,5 +235,5 @@ index 20cc5ff..abe11ad 100644
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From ee64101f6764c9f72a0c602568c0a27a872adeae Mon Sep 17 00:00:00 2001 From c0b4ee8d6319a0fa582a082b881713ff96d27b2b Mon Sep 17 00:00:00 2001
From: DoctorDark <doctordark11@gmail.com> From: DoctorDark <doctordark11@gmail.com>
Date: Wed, 16 Mar 2016 02:21:39 -0500 Date: Wed, 16 Mar 2016 02:21:39 -0500
Subject: [PATCH] Configurable end credits Subject: [PATCH] Configurable end credits
@ -20,7 +20,7 @@ index f7a0c18..31503e7 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 29e33da..a400062 100644 index 5b88b7a..ca9e94a 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -495,6 +495,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -495,6 +495,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -52,5 +52,5 @@ index 29e33da..a400062 100644
} else { } else {
this.b((Statistic) AchievementList.D); this.b((Statistic) AchievementList.D);
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From f20f61e14a0f0ce21e1f6a4dafe533125e40bf0d Mon Sep 17 00:00:00 2001 From 9878ca9652f24a660397d7e2291279a86ef7b54d Mon Sep 17 00:00:00 2001
From: Iceee <andrew@opticgaming.tv> From: Iceee <andrew@opticgaming.tv>
Date: Wed, 2 Mar 2016 01:39:52 -0600 Date: Wed, 2 Mar 2016 01:39:52 -0600
Subject: [PATCH] Fix lag from explosions processing dead entities Subject: [PATCH] Fix lag from explosions processing dead entities
@ -25,5 +25,5 @@ index 904bee8..4e05bcd 100644
for (int l1 = 0; l1 < list.size(); ++l1) { for (int l1 = 0; l1 < list.size(); ++l1) {
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 19f118c6124003316d9f50b1a2f08e90d0b72a8f Mon Sep 17 00:00:00 2001 From 8013611ea29f78ed2c393408a88e2cf1486b9658 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 02:17:54 -0600 Date: Wed, 2 Mar 2016 02:17:54 -0600
Subject: [PATCH] Generator Settings Subject: [PATCH] Generator Settings
@ -265,5 +265,5 @@ index fb350c4..9c1605b 100644
ObjectIterator objectiterator = this.c.values().iterator(); ObjectIterator objectiterator = this.c.values().iterator();
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 28e05719f8e0a3f399db8c129b780df4fc2984e7 Mon Sep 17 00:00:00 2001 From 8ac419a52c439df5879646d8ff7019006015ffba Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 11:59:48 -0600 Date: Wed, 2 Mar 2016 11:59:48 -0600
Subject: [PATCH] Optimize explosions Subject: [PATCH] Optimize explosions
@ -136,7 +136,7 @@ index 2e72b8c..a872e76 100644
// this.i[i][this.ticks % 100] = System.nanoTime() - j; // CraftBukkit // this.i[i][this.ticks % 100] = System.nanoTime() - j; // CraftBukkit
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index abe11ad..1248a9f 100644 index 8cb3a98..b80282b 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -15,6 +15,7 @@ import javax.annotation.Nullable; @@ -15,6 +15,7 @@ import javax.annotation.Nullable;
@ -156,5 +156,5 @@ index abe11ad..1248a9f 100644
public CraftWorld getWorld() { public CraftWorld getWorld() {
return this.world; return this.world;
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,11 +1,11 @@
From f1c57d4b59b8184c15bd0162c9c69b503077b55a Mon Sep 17 00:00:00 2001 From b0f886b09b2d945d228d9929ad9483d9804423f2 Mon Sep 17 00:00:00 2001
From: Iceee <andrew@opticgaming.tv> From: Iceee <andrew@opticgaming.tv>
Date: Wed, 2 Mar 2016 12:03:23 -0600 Date: Wed, 2 Mar 2016 12:03:23 -0600
Subject: [PATCH] Stop updating flowing block if material has changed Subject: [PATCH] Stop updating flowing block if material has changed
diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
index f4ac7bafa..801b9cb7b 100644 index f4ac7ba..801b9cb 100644
--- a/src/main/java/net/minecraft/server/BlockFlowing.java --- a/src/main/java/net/minecraft/server/BlockFlowing.java
+++ b/src/main/java/net/minecraft/server/BlockFlowing.java +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
@@ -90,6 +90,7 @@ public class BlockFlowing extends BlockFluids { @@ -90,6 +90,7 @@ public class BlockFlowing extends BlockFluids {
@ -17,5 +17,5 @@ index f4ac7bafa..801b9cb7b 100644
IBlockData iblockdata2 = world.getType(blockposition.down()); IBlockData iblockdata2 = world.getType(blockposition.down());
-- --
2.11.0.windows.1 2.9.3

Datei anzeigen

@ -1,11 +1,11 @@
From ec2f189973a97ab5ac70fe2faf183e8ee14bdc8f Mon Sep 17 00:00:00 2001 From 744980948a797748c01bbcaba313f3df560719bc Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 12:20:52 -0600 Date: Wed, 2 Mar 2016 12:20:52 -0600
Subject: [PATCH] Fast draining Subject: [PATCH] Fast draining
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 356265e91..2ec50685c 100644 index 356265e..2ec5068 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -191,4 +191,11 @@ public class PaperWorldConfig { @@ -191,4 +191,11 @@ public class PaperWorldConfig {
@ -21,7 +21,7 @@ index 356265e91..2ec50685c 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
index 801b9cb7b..8e9de3bcb 100644 index 801b9cb..8e9de3b 100644
--- a/src/main/java/net/minecraft/server/BlockFlowing.java --- a/src/main/java/net/minecraft/server/BlockFlowing.java
+++ b/src/main/java/net/minecraft/server/BlockFlowing.java +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
@@ -69,7 +69,7 @@ public class BlockFlowing extends BlockFluids { @@ -69,7 +69,7 @@ public class BlockFlowing extends BlockFluids {
@ -109,5 +109,5 @@ index 801b9cb7b..8e9de3bcb 100644
+ // Paper end + // Paper end
} }
-- --
2.11.0.windows.1 2.9.3

Datei anzeigen

@ -1,11 +1,11 @@
From f160baf867681c46bfa3a01220c0add48fbff2e2 Mon Sep 17 00:00:00 2001 From 9a7b96b67c61f7efed2231b2ac695b71fd28116f Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 12:27:07 -0600 Date: Wed, 2 Mar 2016 12:27:07 -0600
Subject: [PATCH] Configurable lava flow speed Subject: [PATCH] Configurable lava flow speed
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 2ec50685c..b5a106d5b 100644 index 2ec5068..b5a106d 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -198,4 +198,11 @@ public class PaperWorldConfig { @@ -198,4 +198,11 @@ public class PaperWorldConfig {
@ -21,7 +21,7 @@ index 2ec50685c..b5a106d5b 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
index 8e9de3bcb..765a37160 100644 index 8e9de3b..765a371 100644
--- a/src/main/java/net/minecraft/server/BlockFlowing.java --- a/src/main/java/net/minecraft/server/BlockFlowing.java
+++ b/src/main/java/net/minecraft/server/BlockFlowing.java +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
@@ -272,6 +272,9 @@ public class BlockFlowing extends BlockFluids { @@ -272,6 +272,9 @@ public class BlockFlowing extends BlockFluids {
@ -35,5 +35,5 @@ index 8e9de3bcb..765a37160 100644
world.getType(blockposition.north(1)).getBlock().material == Material.LAVA || world.getType(blockposition.north(1)).getBlock().material == Material.LAVA ||
world.getType(blockposition.south(1)).getBlock().material == Material.LAVA || world.getType(blockposition.south(1)).getBlock().material == Material.LAVA ||
-- --
2.11.0.windows.1 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 4674b438eaca643fc5ced705ce51804c45410d52 Mon Sep 17 00:00:00 2001 From 16e9f633d0e8dfafc9ae804697b3b18e12312aec Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 14:35:27 -0600 Date: Wed, 2 Mar 2016 14:35:27 -0600
Subject: [PATCH] Add player view distance API Subject: [PATCH] Add player view distance API

Datei anzeigen

@ -1,4 +1,4 @@
From ea9f6345fab166ab7678c9e5212b78f2fc18618d Mon Sep 17 00:00:00 2001 From 7d1dd59d14b025644570acfcdca2a484ab8b1c6a Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com> From: Sudzzy <originmc@outlook.com>
Date: Wed, 2 Mar 2016 14:48:03 -0600 Date: Wed, 2 Mar 2016 14:48:03 -0600
Subject: [PATCH] Disable explosion knockback Subject: [PATCH] Disable explosion knockback
@ -19,7 +19,7 @@ index b5a106d..fcbf8a2 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 3267357..87a8a3e 100644 index b328b25..fe6fe3f 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
@@ -892,12 +892,14 @@ public abstract class EntityLiving extends Entity { @@ -892,12 +892,14 @@ public abstract class EntityLiving extends Entity {
@ -69,5 +69,5 @@ index 49fc95e..d7bc6a0 100644
} }
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 6ca8b0e340f4ec99543cf6b3f700bb290f49d05c Mon Sep 17 00:00:00 2001 From b5b06750f1956bfa1a74efeaa6f68bcc0e0b26b5 Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com> From: Sudzzy <originmc@outlook.com>
Date: Wed, 2 Mar 2016 14:52:43 -0600 Date: Wed, 2 Mar 2016 14:52:43 -0600
Subject: [PATCH] Disable thunder Subject: [PATCH] Disable thunder
@ -19,7 +19,7 @@ index fcbf8a2..b52e5c5 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 6afcf7c..ca74db6 100644 index 2817191..c4f0e68 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -427,7 +427,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -427,7 +427,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -33,5 +33,5 @@ index 6afcf7c..ca74db6 100644
l = this.l >> 2; l = this.l >> 2;
blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15))); blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From b8fb8297e40abe3791a77426cbdb2a690e39801b Mon Sep 17 00:00:00 2001 From 524b919f7729b5f39111e2ff26f2aab3c43e46c3 Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com> From: Sudzzy <originmc@outlook.com>
Date: Wed, 2 Mar 2016 14:57:24 -0600 Date: Wed, 2 Mar 2016 14:57:24 -0600
Subject: [PATCH] Disable ice and snow Subject: [PATCH] Disable ice and snow
@ -19,7 +19,7 @@ index b52e5c5..a6afdd3 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index ca74db6..c84121c 100644 index c4f0e68..52b70e7 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -450,7 +450,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -450,7 +450,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -32,5 +32,5 @@ index ca74db6..c84121c 100644
l = this.l >> 2; l = this.l >> 2;
blockposition = this.p(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15))); blockposition = this.p(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From d83f4a1d0a54a8c3e7c06b042e8bd56899562124 Mon Sep 17 00:00:00 2001 From 06a5cb408921635efb8416880126f0bc0c7e1233 Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com> From: Sudzzy <originmc@outlook.com>
Date: Wed, 2 Mar 2016 15:03:53 -0600 Date: Wed, 2 Mar 2016 15:03:53 -0600
Subject: [PATCH] Configurable mob spawner tick rate Subject: [PATCH] Configurable mob spawner tick rate
@ -64,5 +64,5 @@ index 5b41955..e523267 100644
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 609427e7e62088cfde2ec8cf8026a4a1faf6520d Mon Sep 17 00:00:00 2001 From 6e4bf10e4048b6989928b12e4df3d237dbb44a4c Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Wed, 2 Mar 2016 23:13:07 -0600 Date: Wed, 2 Mar 2016 23:13:07 -0600
Subject: [PATCH] Send absolute position the first time an entity is seen Subject: [PATCH] Send absolute position the first time an entity is seen
@ -76,5 +76,5 @@ index b688e99..370cb9c 100644
entityplayer.playerConnection.sendPacket(packet); entityplayer.playerConnection.sendPacket(packet);
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 64d0dc145be3cbadee1c880bd14d7f12a416b163 Mon Sep 17 00:00:00 2001 From f2e99545394c0006dcd8d1499aeaed4a7e8e9ce4 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 23:30:53 -0600 Date: Wed, 2 Mar 2016 23:30:53 -0600
Subject: [PATCH] Add BeaconEffectEvent Subject: [PATCH] Add BeaconEffectEvent
@ -69,5 +69,5 @@ index 6f2fcd2..71ecc54 100644
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 0aaf35605b0cf4b1c71d3678308de74f272958f4 Mon Sep 17 00:00:00 2001 From a0d114ddff46e2250c3550301b1aa355ef9366c9 Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com> From: Sudzzy <originmc@outlook.com>
Date: Wed, 2 Mar 2016 23:34:44 -0600 Date: Wed, 2 Mar 2016 23:34:44 -0600
Subject: [PATCH] Configurable container update tick rate Subject: [PATCH] Configurable container update tick rate
@ -19,7 +19,7 @@ index 57480f5..b2b94b8 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 635aad7..feb07a3 100644 index 1982749..9662ea0 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -65,6 +65,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -65,6 +65,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -45,5 +45,5 @@ index 635aad7..feb07a3 100644
this.closeInventory(); this.closeInventory();
this.activeContainer = this.defaultContainer; this.activeContainer = this.defaultContainer;
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 4ae31b52610780b8ea042468d9f7e92f9fe39aad Mon Sep 17 00:00:00 2001 From 2087e0322bd2350d334b5292ab192c1be0814418 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com> From: Techcable <Techcable@outlook.com>
Date: Wed, 2 Mar 2016 23:42:37 -0600 Date: Wed, 2 Mar 2016 23:42:37 -0600
Subject: [PATCH] Use UserCache for player heads Subject: [PATCH] Use UserCache for player heads
@ -31,5 +31,5 @@ index f07eb2f..18cc746 100644
// Spigot end // Spigot end
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,11 +1,11 @@
From 1aeba86f37f8a1f7228c43dcd534c58e60e813cb Mon Sep 17 00:00:00 2001 From aaf0b0ceee9322dfea65e9a1333add96e1b3f807 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 2 Mar 2016 23:45:17 -0600 Date: Wed, 2 Mar 2016 23:45:17 -0600
Subject: [PATCH] Disable spigot tick limiters Subject: [PATCH] Disable spigot tick limiters
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 1248a9f..0b76735 100644 index b80282b..49c20b3 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1444,10 +1444,10 @@ public abstract class World implements IBlockAccess { @@ -1444,10 +1444,10 @@ public abstract class World implements IBlockAccess {
@ -35,5 +35,5 @@ index 1248a9f..0b76735 100644
TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition); TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition);
// Spigot start // Spigot start
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 99225c7a0f8aae8fd2a853fe687d026b79b68b2a Mon Sep 17 00:00:00 2001 From aed18d9a756c228540dab9234db0d182565262eb Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 2 Mar 2016 23:46:57 -0600 Date: Wed, 2 Mar 2016 23:46:57 -0600
Subject: [PATCH] Configurable Chunk IO Thread Base Count Subject: [PATCH] Configurable Chunk IO Thread Base Count
@ -39,5 +39,5 @@ index e4fd9bc..7b7a3d0 100644
private static final AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException> instance = new AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException>(new ChunkIOProvider(), BASE_THREADS); private static final AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException> instance = new AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException>(new ChunkIOProvider(), BASE_THREADS);
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 6baf075a94cb42c637f90740d46550f578b01a4a Mon Sep 17 00:00:00 2001 From 06479b95dff55813423388c8af4a933ac5dda039 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 2 Mar 2016 23:51:51 -0600 Date: Wed, 2 Mar 2016 23:51:51 -0600
Subject: [PATCH] Don't create Region File's when checking if chunk exists Subject: [PATCH] Don't create Region File's when checking if chunk exists
@ -49,5 +49,5 @@ index f234298..933934f 100644
file1.mkdirs(); file1.mkdirs();
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From cc06513c3046952af2dc49fb74bb9367649bc6ad Mon Sep 17 00:00:00 2001 From bffea907537f9020197917bf12fd30854e784e30 Mon Sep 17 00:00:00 2001
From: Steve Anton <anxuiz.nx@gmail.com> From: Steve Anton <anxuiz.nx@gmail.com>
Date: Thu, 3 Mar 2016 00:09:38 -0600 Date: Thu, 3 Mar 2016 00:09:38 -0600
Subject: [PATCH] Add PlayerInitialSpawnEvent Subject: [PATCH] Add PlayerInitialSpawnEvent
@ -32,5 +32,5 @@ index 04d6355..954d035 100644
entityplayer.playerInteractManager.a((WorldServer) entityplayer.world); entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
String s1 = "local"; String s1 = "local";
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From e5e333c8fb98fadbd22786c882eb57256559d107 Mon Sep 17 00:00:00 2001 From 6a85f370b6f22ff909e7b4e3af7d3b4d906fc93a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 01:13:45 -0600 Date: Thu, 3 Mar 2016 01:13:45 -0600
Subject: [PATCH] Disable chest cat detection Subject: [PATCH] Disable chest cat detection
@ -35,5 +35,5 @@ index d919d78..9d4c15f 100644
EntityOcelot entityocelot; EntityOcelot entityocelot;
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From f5fbbeec055ca9162db7b1d993ef4fdcd54aabbf Mon Sep 17 00:00:00 2001 From b6c5618486f53dfafb58fd8b0699a2ebe145013c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 01:17:12 -0600 Date: Thu, 3 Mar 2016 01:17:12 -0600
Subject: [PATCH] Ensure commands are not ran async Subject: [PATCH] Ensure commands are not ran async

Datei anzeigen

@ -1,4 +1,4 @@
From af6c0fa076b068aeee801ed17492e52d8dc528cf Mon Sep 17 00:00:00 2001 From 96963b668d65bac53132de642fa2e1b3c1b5c967 Mon Sep 17 00:00:00 2001
From: vemacs <d@nkmem.es> From: vemacs <d@nkmem.es>
Date: Thu, 3 Mar 2016 01:19:22 -0600 Date: Thu, 3 Mar 2016 01:19:22 -0600
Subject: [PATCH] All chunks are slime spawn chunks toggle Subject: [PATCH] All chunks are slime spawn chunks toggle
@ -33,5 +33,5 @@ index 91ed719..950f07d 100644
} }
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 65c8b392d267976d2e7592777f581170493eb311 Mon Sep 17 00:00:00 2001 From fa3b82efa55cdcd8c7388ec868278b48be00961d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 02:02:07 -0600 Date: Thu, 3 Mar 2016 02:02:07 -0600
Subject: [PATCH] Optimize Pathfinding Subject: [PATCH] Optimize Pathfinding
@ -47,5 +47,5 @@ index 4f28b88..43b2be5 100644
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 315637d90a175804eb0576eb881d06a37c81dacb Mon Sep 17 00:00:00 2001 From b17725413c3a4ad11af1df1d69c71dfd96350a29 Mon Sep 17 00:00:00 2001
From: CullanP <cullanpage@gmail.com> From: CullanP <cullanpage@gmail.com>
Date: Thu, 3 Mar 2016 02:13:38 -0600 Date: Thu, 3 Mar 2016 02:13:38 -0600
Subject: [PATCH] Avoid hopper searches if there are no items Subject: [PATCH] Avoid hopper searches if there are no items
@ -95,5 +95,5 @@ index b80f951..e1fc4ea 100644
while (iterator.hasNext()) { while (iterator.hasNext()) {
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,11 +1,11 @@
From 152826c44acd165e785f018fc2cd1b96d8e23b21 Mon Sep 17 00:00:00 2001 From 0fb5e856063297b816b8a7ca739b31698f293a65 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc> From: kashike <kashike@vq.lc>
Date: Thu, 3 Mar 2016 02:15:57 -0600 Date: Thu, 3 Mar 2016 02:15:57 -0600
Subject: [PATCH] Expose server CommandMap Subject: [PATCH] Expose server CommandMap
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ff0a441..a9ccc8a 100644 index 32de676..b7a825a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1566,6 +1566,7 @@ public final class CraftServer implements Server { @@ -1566,6 +1566,7 @@ public final class CraftServer implements Server {
@ -17,5 +17,5 @@ index ff0a441..a9ccc8a 100644
return commandMap; return commandMap;
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 959189247bab3064b63c69bafee372afd8d85f30 Mon Sep 17 00:00:00 2001 From 3297e1fe6b7fed7ddd2c00a13ce84b44867ba8a5 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc> From: kashike <kashike@vq.lc>
Date: Thu, 3 Mar 2016 02:18:39 -0600 Date: Thu, 3 Mar 2016 02:18:39 -0600
Subject: [PATCH] Be a bit more informative in maxHealth exception Subject: [PATCH] Be a bit more informative in maxHealth exception
@ -21,5 +21,5 @@ index 4641e3d..aaea4e8 100644
if (health == 0) { if (health == 0) {
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,11 +1,11 @@
From 3c8a747e4c7fb30a356120b0098afdc7752fb0c5 Mon Sep 17 00:00:00 2001 From d932ae0cc0bfac3a416351d0d9f847d7da9a2c82 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 3 Mar 2016 02:21:58 -0600 Date: Thu, 3 Mar 2016 02:21:58 -0600
Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a9ccc8a..ef3980f 100644 index b7a825a..b59b756 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1314,6 +1314,18 @@ public final class CraftServer implements Server { @@ -1314,6 +1314,18 @@ public final class CraftServer implements Server {
@ -28,7 +28,7 @@ index a9ccc8a..ef3980f 100644
@Deprecated @Deprecated
public OfflinePlayer getOfflinePlayer(String name) { public OfflinePlayer getOfflinePlayer(String name) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e1b04cb..1d4e8b2 100644 index 318b460..2108001 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -156,6 +156,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -156,6 +156,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -56,5 +56,5 @@ index e1b04cb..1d4e8b2 100644
public String getDisplayName() { public String getDisplayName() {
return getHandle().displayName; return getHandle().displayName;
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From fcc4f1380b80f58a3e9e50569e048c994076ef03 Mon Sep 17 00:00:00 2001 From 7a2dcb0a133f45c7b66c88d85e5a048ea1306012 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com> From: Techcable <Techcable@outlook.com>
Date: Thu, 3 Mar 2016 02:32:10 -0600 Date: Thu, 3 Mar 2016 02:32:10 -0600
Subject: [PATCH] Player Tab List and Title APIs Subject: [PATCH] Player Tab List and Title APIs
@ -78,7 +78,7 @@ index 7bcafa8..4f6c1c2 100644
if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) { if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e0ec47f..ab467d8 100644 index 2108001..7a4ceb3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
@ -173,5 +173,5 @@ index e0ec47f..ab467d8 100644
@Override @Override
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,11 +1,11 @@
From a8af90e7ba90ef632cabe8587805da77dd2f62fd Mon Sep 17 00:00:00 2001 From 0cd5324300e158b0bde0ea0c1884835194f9bf85 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io> From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:33:53 -0600 Date: Thu, 3 Mar 2016 02:33:53 -0600
Subject: [PATCH] Ensure inv drag is in bounds Subject: [PATCH] Ensure inv drag is in bounds
diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java
index 69f93d6..0ef93c6 100644 index 686250e..b826089 100644
--- a/src/main/java/net/minecraft/server/Container.java --- a/src/main/java/net/minecraft/server/Container.java
+++ b/src/main/java/net/minecraft/server/Container.java +++ b/src/main/java/net/minecraft/server/Container.java
@@ -141,7 +141,7 @@ public abstract class Container { @@ -141,7 +141,7 @@ public abstract class Container {
@ -18,5 +18,5 @@ index 69f93d6..0ef93c6 100644
itemstack1 = playerinventory.getCarried(); itemstack1 = playerinventory.getCarried();
if (slot != null && a(slot, itemstack1, true) && slot.isAllowed(itemstack1) && (this.dragType == 2 || itemstack1.getCount() > this.h.size()) && this.b(slot)) { if (slot != null && a(slot, itemstack1, true) && slot.isAllowed(itemstack1) && (this.dragType == 2 || itemstack1.getCount() > this.h.size()) && this.b(slot)) {
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 006b38a4cab58583721baed2bb4adff90d8ef3ec Mon Sep 17 00:00:00 2001 From aae6be8e71297748f3d6edb5070242db78dc4eb2 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io> From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:39:54 -0600 Date: Thu, 3 Mar 2016 02:39:54 -0600
Subject: [PATCH] Change implementation of (tile)entity removal list Subject: [PATCH] Change implementation of (tile)entity removal list
@ -24,7 +24,7 @@ index 40398ca..10eb818 100644
public boolean impulse; public boolean impulse;
public int portalCooldown; public int portalCooldown;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 0b76735..c8a0ae6 100644 index 49c20b3..6213997 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -30,6 +30,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; @@ -30,6 +30,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@ -84,5 +84,5 @@ index 0b76735..c8a0ae6 100644
this.f.clear(); this.f.clear();
this.l(); this.l();
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From b20c7db532ff71e74c17adeb96fe16d1d83ef5f9 Mon Sep 17 00:00:00 2001 From c0c4191f67899e3143f6d575291a7a5e9db41293 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io> From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:46:17 -0600 Date: Thu, 3 Mar 2016 02:46:17 -0600
Subject: [PATCH] Add configurable portal search radius Subject: [PATCH] Add configurable portal search radius
@ -54,5 +54,5 @@ index 1d5dce1..7ca2617 100644
private boolean canCreatePortal = true; private boolean canCreatePortal = true;
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,11 +1,11 @@
From fe5e6dc3ec8448a373edc77718f64fc51654b95d Mon Sep 17 00:00:00 2001 From 1eb36b44685655bc53589dcc93ac704000d8f3fa Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io> From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:48:12 -0600 Date: Thu, 3 Mar 2016 02:48:12 -0600
Subject: [PATCH] Add velocity warnings Subject: [PATCH] Add velocity warnings
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index f8aabe2..6d39f6b 100644 index 5b01727..ae95c76 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -227,6 +227,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -227,6 +227,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@ -22,5 +22,5 @@ index f8aabe2..6d39f6b 100644
entity.motY = vel.getY(); entity.motY = vel.getY();
entity.motZ = vel.getZ(); entity.motZ = vel.getZ();
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 94b4bd63864958e0a8d27e2844acea2ddd2103d5 Mon Sep 17 00:00:00 2001 From 7e1a809697044e335aa5821b9b74887ff00c93de Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com> From: Sudzzy <originmc@outlook.com>
Date: Thu, 3 Mar 2016 02:50:31 -0600 Date: Thu, 3 Mar 2016 02:50:31 -0600
Subject: [PATCH] Fix inter-world teleportation glitches Subject: [PATCH] Fix inter-world teleportation glitches
@ -25,7 +25,7 @@ index ed63854..7005d69 100644
+ } + }
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 6a6d5de..a4ba222 100644 index 7a4ceb3..e7b04c2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -592,7 +592,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -592,7 +592,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -39,5 +39,5 @@ index 6a6d5de..a4ba222 100644
return true; return true;
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 191114236c8aa8add618bbfbc2546ce8fbee3399 Mon Sep 17 00:00:00 2001 From 8269ddeb91023116f0bd1c97371332886f1de29f Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io> From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 03:15:41 -0600 Date: Thu, 3 Mar 2016 03:15:41 -0600
Subject: [PATCH] Add exception reporting event Subject: [PATCH] Add exception reporting event
@ -244,7 +244,7 @@ index 933934f..19fbf9b 100644
} }
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index 171410e..8c35cab 100644 index 30aacc9..31bafc6 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -7,6 +7,7 @@ import java.util.Random; @@ -7,6 +7,7 @@ import java.util.Random;
@ -292,7 +292,7 @@ index 7af5b7d..2b49802 100644
} }
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index c8a0ae6..8272d89 100644 index 6213997..ad6ad75 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
@ -372,5 +372,5 @@ index 198c37c..cdb836a 100644
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code) // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 54384862cb8a34c0892bf94a4e77660c531d6dc2 Mon Sep 17 00:00:00 2001 From cce8316893f358e8804df5975fff98d9a57af614 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc> From: kashike <kashike@vq.lc>
Date: Tue, 8 Mar 2016 18:28:43 -0800 Date: Tue, 8 Mar 2016 18:28:43 -0800
Subject: [PATCH] Don't nest if we don't need to when cerealising text Subject: [PATCH] Don't nest if we don't need to when cerealising text
@ -26,5 +26,5 @@ index 9fc83c4..b3b13ba 100644
packetdataserializer.a(this.a); packetdataserializer.a(this.a);
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 9d9f39fa78bdfe32ca8c538d05c840470d9ce5ae Mon Sep 17 00:00:00 2001 From 6f05d80095233fccb6de27c6b01d1922759a6a3b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 8 Mar 2016 23:25:45 -0500 Date: Tue, 8 Mar 2016 23:25:45 -0500
Subject: [PATCH] Disable Scoreboards for non players by default Subject: [PATCH] Disable Scoreboards for non players by default
@ -49,5 +49,5 @@ index 10eb818..875dcc8 100644
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 8c3db58f89aa782429d2f32e0da3c3cf9f3d39a9 Mon Sep 17 00:00:00 2001 From 81be8d010592ebcb1bf34ccb0168c779ce81c430 Mon Sep 17 00:00:00 2001
From: mrapple <tony@oc.tc> From: mrapple <tony@oc.tc>
Date: Sun, 25 Nov 2012 13:43:39 -0600 Date: Sun, 25 Nov 2012 13:43:39 -0600
Subject: [PATCH] Add methods for working with arrows stuck in living entities Subject: [PATCH] Add methods for working with arrows stuck in living entities

Datei anzeigen

@ -1,4 +1,4 @@
From 2c3f33cf991b20a34238a2472472a37b70134149 Mon Sep 17 00:00:00 2001 From 3a3b561fa65a9f3968be6fbf9e6a810da8930a8e Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 4 Apr 2015 23:17:52 -0400 Date: Sat, 4 Apr 2015 23:17:52 -0400
Subject: [PATCH] Complete resource pack API Subject: [PATCH] Complete resource pack API

Datei anzeigen

@ -1,4 +1,4 @@
From 88988bc9d659401547d7d18f14f246d99dafd814 Mon Sep 17 00:00:00 2001 From 4b8f5ca789ee647a2dba593df65f22b8a76f411c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 4 Mar 2016 18:18:37 -0600 Date: Fri, 4 Mar 2016 18:18:37 -0600
Subject: [PATCH] Chunk save queue improvements Subject: [PATCH] Chunk save queue improvements
@ -177,5 +177,5 @@ index acfdd52..fdbaf5f 100644
if (this.b.isEmpty()) { if (this.b.isEmpty()) {
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 5b78b518b5c1eb3c2699e94e7ea20c74cd91dc94 Mon Sep 17 00:00:00 2001 From 716634213d675f576b1e196476bcf4380267b36c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 4 Mar 2013 23:46:10 -0500 Date: Mon, 4 Mar 2013 23:46:10 -0500
Subject: [PATCH] Chunk Save Reattempt Subject: [PATCH] Chunk Save Reattempt
@ -42,5 +42,5 @@ index be13c11..9cfc46b 100644
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From b7317d54c56155ca9d901cc1905796e26bc69570 Mon Sep 17 00:00:00 2001 From 62a1748fca01d80144e90defa25e5d9ff6fadc36 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 13:17:38 -0400 Date: Fri, 18 Mar 2016 13:17:38 -0400
Subject: [PATCH] Default loading permissions.yml before plugins Subject: [PATCH] Default loading permissions.yml before plugins
@ -30,7 +30,7 @@ index c1a8243..88b6778 100644
+ } + }
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ef3980f..bb49a22 100644 index b59b756..7d2d9e2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -316,6 +316,7 @@ public final class CraftServer implements Server { @@ -316,6 +316,7 @@ public final class CraftServer implements Server {
@ -51,5 +51,5 @@ index ef3980f..bb49a22 100644
CraftDefaultPermissions.registerCorePermissions(); CraftDefaultPermissions.registerCorePermissions();
helpMap.initializeCommands(); helpMap.initializeCommands();
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From b7ca75de3ebba6ca6772958e9ae6079e4fc5a385 Mon Sep 17 00:00:00 2001 From ea764e7810887eefc6a4c52d4977bfd81adad442 Mon Sep 17 00:00:00 2001
From: William <admin@domnian.com> From: William <admin@domnian.com>
Date: Fri, 18 Mar 2016 03:30:17 -0400 Date: Fri, 18 Mar 2016 03:30:17 -0400
Subject: [PATCH] Allow Reloading of Custom Permissions Subject: [PATCH] Allow Reloading of Custom Permissions
@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
https://github.com/PaperMC/Paper/issues/49 https://github.com/PaperMC/Paper/issues/49
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index bb49a22..180a297 100644 index 7d2d9e2..0693d12 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1826,4 +1826,21 @@ public final class CraftServer implements Server { @@ -1826,4 +1826,21 @@ public final class CraftServer implements Server {
@ -32,5 +32,5 @@ index bb49a22..180a297 100644
+ // Paper end + // Paper end
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 29b28b03b5e0735a441d52d55b8847ca6e07d7c6 Mon Sep 17 00:00:00 2001 From b6bf708e91cda0ce2d7cb923e75fc94dacdbdb2d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 13:50:14 -0400 Date: Fri, 18 Mar 2016 13:50:14 -0400
Subject: [PATCH] Remove Metadata on reload Subject: [PATCH] Remove Metadata on reload
@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
This will remove metadata on reload so it does not crash everything if a plugin uses it. This will remove metadata on reload so it does not crash everything if a plugin uses it.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 180a297..7364705 100644 index 0693d12..f154248 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -739,6 +739,14 @@ public final class CraftServer implements Server { @@ -739,6 +739,14 @@ public final class CraftServer implements Server {
@ -26,5 +26,5 @@ index 180a297..7364705 100644
commandMap.clearCommands(); commandMap.clearCommands();
resetRecipes(); resetRecipes();
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 39c79a5582c9b90c852330cb1dd78452af1096a9 Mon Sep 17 00:00:00 2001 From 48c89f37527f39d4bc234b16769b8f482a35fbe5 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 14:19:19 -0400 Date: Fri, 18 Mar 2016 14:19:19 -0400
Subject: [PATCH] Undead horse leashing Subject: [PATCH] Undead horse leashing
@ -20,7 +20,7 @@ index b3678da..029eb39 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index da95a59..67f66fd 100644 index d74ccd6..3416c7a 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -115,7 +115,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven @@ -115,7 +115,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@ -33,5 +33,5 @@ index da95a59..67f66fd 100644
protected void q(float f) { protected void q(float f) {
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From f2abce9bbd30a3db0b929462ffc7cd2f6d44c80d Mon Sep 17 00:00:00 2001 From 07a7621aa33ff2427947824eb0dcafdc3fc77537 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 14:24:53 -0400 Date: Fri, 18 Mar 2016 14:24:53 -0400
Subject: [PATCH] Fix Furnace cook time bug Subject: [PATCH] Fix Furnace cook time bug
@ -9,7 +9,7 @@ cook in the expected amount of time as the cook time was not decremented correct
This patch ensures that furnaces cook to the correct wall time expectation. This patch ensures that furnaces cook to the correct wall time expectation.
diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
index 93a610a..661716d 100644 index 2f1f3ed..ef63236 100644
--- a/src/main/java/net/minecraft/server/TileEntityFurnace.java --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
+++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
@@ -165,7 +165,7 @@ public class TileEntityFurnace extends TileEntityContainer implements ITickable, @@ -165,7 +165,7 @@ public class TileEntityFurnace extends TileEntityContainer implements ITickable,
@ -22,5 +22,5 @@ index 93a610a..661716d 100644
this.burn(); this.burn();
flag1 = true; flag1 = true;
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From d85208945003e34255152d5268d9db24a609f8a3 Mon Sep 17 00:00:00 2001 From f5f66d0d6388d120fe4e026e36ab0ebe9d02ece0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 28 May 2015 23:00:19 -0400 Date: Thu, 28 May 2015 23:00:19 -0400
Subject: [PATCH] Handle Item Meta Inconsistencies Subject: [PATCH] Handle Item Meta Inconsistencies

Datei anzeigen

@ -1,4 +1,4 @@
From 745dd2c92706e3e70d9e4eeed52e40e0670b473f Mon Sep 17 00:00:00 2001 From 875d996f5eb2cd385f95f957e18f97a3ac5f68f0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 15:12:22 -0400 Date: Fri, 18 Mar 2016 15:12:22 -0400
Subject: [PATCH] Configurable Non Player Arrow Despawn Rate Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
@ -24,7 +24,7 @@ index 029eb39..9cce672 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index 287566c..bb332b3 100644 index f2317e5..4b01cc0 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java --- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -157,7 +157,7 @@ public abstract class EntityArrow extends Entity implements IProjectile { @@ -157,7 +157,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@ -37,5 +37,5 @@ index 287566c..bb332b3 100644
} }
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 890c1645cb95a10a2b3269ed85cb463e3e424b05 Mon Sep 17 00:00:00 2001 From 948d3ade5648c450c629839997c0982280f8d8e5 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 20:16:03 -0400 Date: Fri, 18 Mar 2016 20:16:03 -0400
Subject: [PATCH] Add World Util Methods Subject: [PATCH] Add World Util Methods
@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
Methods that can be used for other patches to help improve logic. Methods that can be used for other patches to help improve logic.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 8272d89..223250f 100644 index ad6ad75..7d3770d 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -152,6 +152,12 @@ public abstract class World implements IBlockAccess { @@ -152,6 +152,12 @@ public abstract class World implements IBlockAccess {
@ -93,5 +93,5 @@ index 8272d89..223250f 100644
// CraftBukkit start - tree generation // CraftBukkit start - tree generation
if (captureTreeGeneration) { if (captureTreeGeneration) {
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From b2ed021cc393f2627735d38208e87c972ff5dcd1 Mon Sep 17 00:00:00 2001 From 94e2ca15762051fb10c5b1fd3c20d0010320a799 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 21:22:56 -0400 Date: Fri, 18 Mar 2016 21:22:56 -0400
Subject: [PATCH] Optimized Light Level Comparisons Subject: [PATCH] Optimized Light Level Comparisons
@ -131,5 +131,5 @@ index 897882c..970fabf 100644
if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D) && this.world.a(entityzombie.getBoundingBox(), (Entity) entityzombie) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()).isEmpty() && !this.world.containsLiquid(entityzombie.getBoundingBox())) { if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D) && this.world.a(entityzombie.getBoundingBox(), (Entity) entityzombie) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()).isEmpty() && !this.world.containsLiquid(entityzombie.getBoundingBox())) {
this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From aa4add7106265a50c2756dcd8dbc5b6912ffc116 Mon Sep 17 00:00:00 2001 From bea3556fa7b29fdf1627b7acd61e4f5f48ea2c59 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 19 Mar 2016 15:16:54 -0400 Date: Sat, 19 Mar 2016 15:16:54 -0400
Subject: [PATCH] Pass world to Village creation Subject: [PATCH] Pass world to Village creation
@ -32,5 +32,5 @@ index 2ab381d..817c836 100644
this.d = BlockPosition.ZERO; this.d = BlockPosition.ZERO;
this.j = Maps.newHashMap(); this.j = Maps.newHashMap();
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 6de1e740885e08b20f142d25e047d1a949ce0cbc Mon Sep 17 00:00:00 2001 From 45328410f1076259957edf11907b79c1c284db35 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 21 Jun 2015 15:07:20 -0400 Date: Sun, 21 Jun 2015 15:07:20 -0400
Subject: [PATCH] Custom replacement for eaten items Subject: [PATCH] Custom replacement for eaten items

Datei anzeigen

@ -1,4 +1,4 @@
From 6c7006b595785c4b8b0435af3bd7055fcf019576 Mon Sep 17 00:00:00 2001 From 9ef19d23fd92041aa9c5da721b7253f09c5e64e3 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 19 Jul 2015 16:51:38 -0400 Date: Sun, 19 Jul 2015 16:51:38 -0400
Subject: [PATCH] Set health before death event Subject: [PATCH] Set health before death event
@ -45,5 +45,5 @@ index 2a77cd4..0493c1b 100644
public double getMaxHealth() { public double getMaxHealth() {
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 5fc1a30d419fe9aebcaff5cb6bfb2e559b83b40e Mon Sep 17 00:00:00 2001 From 04b8471c6a6152c2658e668e0431e5e76bc212d9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 27 Sep 2015 01:18:02 -0400 Date: Sun, 27 Sep 2015 01:18:02 -0400
Subject: [PATCH] handle NaN health/absorb values and repair bad data Subject: [PATCH] handle NaN health/absorb values and repair bad data
@ -44,7 +44,7 @@ index 539d016..1eee8a3 100644
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 5be1a6f..06e401a 100644 index 9ef6ba2..eba73cf 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1412,6 +1412,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1412,6 +1412,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

Datei anzeigen

@ -1,4 +1,4 @@
From 67cdeb4969936cc2040d98c8fe777c852df52ad6 Mon Sep 17 00:00:00 2001 From 2ac0bf359dd04900d5cc9abe28b618ee3cd65177 Mon Sep 17 00:00:00 2001
From: Daniel Ennis <dennis@icontact.com> From: Daniel Ennis <dennis@icontact.com>
Date: Sun, 20 Mar 2016 15:22:42 -0400 Date: Sun, 20 Mar 2016 15:22:42 -0400
Subject: [PATCH] Catch Async PlayerChunkMap operations Subject: [PATCH] Catch Async PlayerChunkMap operations

Datei anzeigen

@ -1,4 +1,4 @@
From 43d4f73060153a5e017db795dfdcee5e42f00bab Mon Sep 17 00:00:00 2001 From bba6f36ded9d5541b4a9370962bddafe36f8f22a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 21 Mar 2016 00:19:18 -0500 Date: Mon, 21 Mar 2016 00:19:18 -0500
Subject: [PATCH] Support offline mode in whitelist command as well Subject: [PATCH] Support offline mode in whitelist command as well
@ -89,5 +89,5 @@ index c74d1d2..0f4237d 100644
+ // Paper end + // Paper end
} }
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 8f8a9fef6f5ec940e55af3abcfa351eb280db615 Mon Sep 17 00:00:00 2001 From aa51369f8e36ad18e7879bacbb6928a4b09523cb Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 5 Jan 2016 21:48:24 -0500 Date: Tue, 5 Jan 2016 21:48:24 -0500
Subject: [PATCH] Fix SkullCache case bug Subject: [PATCH] Fix SkullCache case bug
@ -18,5 +18,5 @@ index 91ca4a2..edd6fb6 100644
callback.apply(profile); callback.apply(profile);
} else { } else {
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 428f579770b2aa61fc95a85a5561c3a9ac77d184 Mon Sep 17 00:00:00 2001 From 06895d6610c5ade61bdc43016d06e08322d3dbf2 Mon Sep 17 00:00:00 2001
From: Gabscap <sonstige.netzwerke@gabriel-paradzik.de> From: Gabscap <sonstige.netzwerke@gabriel-paradzik.de>
Date: Sat, 19 Mar 2016 22:25:11 +0100 Date: Sat, 19 Mar 2016 22:25:11 +0100
Subject: [PATCH] Waving banner workaround Subject: [PATCH] Waving banner workaround
@ -34,5 +34,5 @@ index c5c3f40..6413f76 100644
public void a(PacketDataSerializer packetdataserializer) throws IOException { public void a(PacketDataSerializer packetdataserializer) throws IOException {
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 554f7c012ab7cb05dbaf758c2a6b70b15dc2f634 Mon Sep 17 00:00:00 2001 From 7c112d4d93a3caf178493739c38a195c33160c3d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 22 Mar 2016 00:33:47 -0400 Date: Tue, 22 Mar 2016 00:33:47 -0400
Subject: [PATCH] Use a Shared Random for Entities Subject: [PATCH] Use a Shared Random for Entities
@ -27,5 +27,5 @@ index 875dcc8..ae16663 100644
this.justCreated = true; this.justCreated = true;
this.uniqueID = MathHelper.a(this.random); this.uniqueID = MathHelper.a(this.random);
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 04db83c72b0dd6425fd8d800822a51dcd56e6d5c Mon Sep 17 00:00:00 2001 From 9b15cb205ed349c2902591124e6b009f844aecdc Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 22 Mar 2016 00:55:23 -0400 Date: Tue, 22 Mar 2016 00:55:23 -0400
Subject: [PATCH] Don't teleport dead entities Subject: [PATCH] Don't teleport dead entities
@ -20,5 +20,5 @@ index ae16663..d8ebe11 100644
WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle(); WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
int i = worldserver1.dimension; int i = worldserver1.dimension;
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 77c802f0bbd04aeeb2dece18e0efc00950c987ec Mon Sep 17 00:00:00 2001 From 7391498a32290021322cfe4879630dcc591308ae Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 27 Aug 2015 01:15:02 -0400 Date: Thu, 27 Aug 2015 01:15:02 -0400
Subject: [PATCH] Optimize Chunk Access Subject: [PATCH] Optimize Chunk Access
@ -42,5 +42,5 @@ index 54ca738..902f9ac 100644
public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) { public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) {
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 49d53ee95df9d1cad58e78621fd5a342062e9e09 Mon Sep 17 00:00:00 2001 From 7cd6c9e03ab94fa8b8bf44c9bdceef268dec51e1 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 22 Mar 2016 12:04:28 -0500 Date: Tue, 22 Mar 2016 12:04:28 -0500
Subject: [PATCH] Configurable spawn chances for skeleton horses Subject: [PATCH] Configurable spawn chances for skeleton horses
@ -19,7 +19,7 @@ index 9cce672..d92ccc7 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index c84121c..04f61e9 100644 index 52b70e7..2c75c15 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -435,7 +435,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -435,7 +435,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -32,5 +32,5 @@ index c84121c..04f61e9 100644
entityhorseskeleton.p(true); entityhorseskeleton.p(true);
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 9b31029333fb85ecd0627b4c69982c9b562987ec Mon Sep 17 00:00:00 2001 From 63f474cc48cbf0fe7d2c67f011d835b607fb03d3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 02:07:55 -0600 Date: Thu, 3 Mar 2016 02:07:55 -0600
Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@ -98,7 +98,7 @@ index 3d784d0..afdc4a7 100644
private NibbleArray skyLight; private NibbleArray skyLight;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index ecd2d26..224e4c9 100644 index 7d3770d..8ca33d0 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -273,12 +273,12 @@ public abstract class World implements IBlockAccess { @@ -273,12 +273,12 @@ public abstract class World implements IBlockAccess {
@ -227,7 +227,7 @@ index ecd2d26..224e4c9 100644
public boolean B() { public boolean B() {
return this.J < 4; return this.J < 4;
@@ -2045,7 +2054,7 @@ public abstract class World implements IBlockAccess { @@ -2037,7 +2046,7 @@ public abstract class World implements IBlockAccess {
public Map<BlockPosition, TileEntity> capturedTileEntities = Maps.newHashMap(); public Map<BlockPosition, TileEntity> capturedTileEntities = Maps.newHashMap();
@Nullable @Nullable
public TileEntity getTileEntity(BlockPosition blockposition) { public TileEntity getTileEntity(BlockPosition blockposition) {
@ -236,7 +236,7 @@ index ecd2d26..224e4c9 100644
return null; return null;
} else { } else {
// CraftBukkit start // CraftBukkit start
@@ -2086,7 +2095,7 @@ public abstract class World implements IBlockAccess { @@ -2078,7 +2087,7 @@ public abstract class World implements IBlockAccess {
} }
public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) { public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) {
@ -245,7 +245,7 @@ index ecd2d26..224e4c9 100644
if (tileentity != null && !tileentity.y()) { if (tileentity != null && !tileentity.y()) {
// CraftBukkit start // CraftBukkit start
if (captureBlockStates) { if (captureBlockStates) {
@@ -2149,7 +2158,7 @@ public abstract class World implements IBlockAccess { @@ -2141,7 +2150,7 @@ public abstract class World implements IBlockAccess {
} }
public boolean d(BlockPosition blockposition, boolean flag) { public boolean d(BlockPosition blockposition, boolean flag) {
@ -255,5 +255,5 @@ index ecd2d26..224e4c9 100644
} else { } else {
Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4); Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4);
-- --
2.10.2 2.9.3

Datei anzeigen

@ -1,4 +1,4 @@
From 1224bc8a7663374d3169a7b37fd82fa15a070459 Mon Sep 17 00:00:00 2001 From 27aa9e04eed7118c83df555e0f0509e38094f18d Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 1 Mar 2016 04:32:08 -0500 Date: Tue, 1 Mar 2016 04:32:08 -0500
Subject: [PATCH] Fix cooked fish legacy import Subject: [PATCH] Fix cooked fish legacy import

Datei anzeigen

@ -1,4 +1,4 @@
From dd87a92db737c55ac67cb8bdd74ad21ddfe8e7c5 Mon Sep 17 00:00:00 2001 From 0af5380a6a18ec3d7c06e7fb4501909b55d2da7b Mon Sep 17 00:00:00 2001
From: DemonWav <demonwav@gmail.com> From: DemonWav <demonwav@gmail.com>
Date: Sat, 26 Mar 2016 21:36:05 -0500 Date: Sat, 26 Mar 2016 21:36:05 -0500
Subject: [PATCH] Prevent possible infinite loop in BlockPosition iterator Subject: [PATCH] Prevent possible infinite loop in BlockPosition iterator

Datei anzeigen

@ -1,4 +1,4 @@
From f0d56cc21c423373e46a085939b4192f57a1013f Mon Sep 17 00:00:00 2001 From 24bd2ba47631a8ddefd94a7d2822b5a22d2813e7 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 20 Mar 2016 06:45:01 -0400 Date: Sun, 20 Mar 2016 06:45:01 -0400
Subject: [PATCH] Access items by EquipmentSlot Subject: [PATCH] Access items by EquipmentSlot

Datei anzeigen

@ -1,4 +1,4 @@
From ecd85fe47a95c6799d3137101dc4e4644095b8a6 Mon Sep 17 00:00:00 2001 From 05023155fb6a414d96f5b04f20ceec957c5e4a3b Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 27 Mar 2016 20:24:05 -0500 Date: Sun, 27 Mar 2016 20:24:05 -0500
Subject: [PATCH] Check async, remove unused vars, GH-159 Subject: [PATCH] Check async, remove unused vars, GH-159

Datei anzeigen

@ -1,4 +1,4 @@
From 6eacb52095e6eac9c9f2d94b3b50c721448a9278 Mon Sep 17 00:00:00 2001 From 8152281862b9dd18cd83d50a25445213da0aa6d4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 19:55:45 -0400 Date: Mon, 28 Mar 2016 19:55:45 -0400
Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
@ -25,7 +25,7 @@ index d92ccc7..298c48f 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 224e4c9..0ac8a57 100644 index 8ca33d0..019b185 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -578,7 +578,7 @@ public abstract class World implements IBlockAccess { @@ -578,7 +578,7 @@ public abstract class World implements IBlockAccess {

Datei anzeigen

@ -1,11 +1,11 @@
From 26c49b0604fc10ccbe754dd33791c68c57d8ae84 Mon Sep 17 00:00:00 2001 From c056b9c4109ab49eb510cc72b9f1b984a96ff8bf Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 20:32:58 -0400 Date: Mon, 28 Mar 2016 20:32:58 -0400
Subject: [PATCH] Entity AddTo/RemoveFrom World Events Subject: [PATCH] Entity AddTo/RemoveFrom World Events
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 0ac8a57..fbe33a8 100644 index 019b185..2f92c78 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1179,6 +1179,7 @@ public abstract class World implements IBlockAccess { @@ -1179,6 +1179,7 @@ public abstract class World implements IBlockAccess {

Datei anzeigen

@ -1,4 +1,4 @@
From 85e6989fdc7fd57d46442adca43233022c0f11be Mon Sep 17 00:00:00 2001 From a965153e8399e27c9de94c80a44bb9ddefa2fcec Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 20:46:14 -0400 Date: Mon, 28 Mar 2016 20:46:14 -0400
Subject: [PATCH] Configurable Chunk Inhabited Timer Subject: [PATCH] Configurable Chunk Inhabited Timer

Datei anzeigen

@ -1,4 +1,4 @@
From b0e2f5308c90ca48dc24af1e86b20520e963eba9 Mon Sep 17 00:00:00 2001 From bfadeb0838decd794069106ce6357842b140ea06 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 21:22:26 -0400 Date: Mon, 28 Mar 2016 21:22:26 -0400
Subject: [PATCH] EntityPathfindEvent Subject: [PATCH] EntityPathfindEvent

Datei anzeigen

@ -1,4 +1,4 @@
From 8044718f3a6e4aedccd7d51573c752e2e3ff2492 Mon Sep 17 00:00:00 2001 From cf17689530a155b1d3d0e45c72430be7d603cde0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 22:03:09 -0400 Date: Mon, 28 Mar 2016 22:03:09 -0400
Subject: [PATCH] Prevent Waterflow BlockFromToEvent from loading chunks Subject: [PATCH] Prevent Waterflow BlockFromToEvent from loading chunks

Datei anzeigen

@ -1,4 +1,4 @@
From 471591d79ffceac151b5a06c667ccaf32a356c4e Mon Sep 17 00:00:00 2001 From 26ec2b878c8559f55150b3df075119d3ef289f25 Mon Sep 17 00:00:00 2001
From: Antony Riley <antony@cyberiantiger.org> From: Antony Riley <antony@cyberiantiger.org>
Date: Tue, 29 Mar 2016 06:56:23 +0300 Date: Tue, 29 Mar 2016 06:56:23 +0300
Subject: [PATCH] Reduce IO ops opening a new region file. Subject: [PATCH] Reduce IO ops opening a new region file.

Datei anzeigen

@ -1,4 +1,4 @@
From 325d3bb7b69bb86e217ca758a8e12a1a946c4972 Mon Sep 17 00:00:00 2001 From 90af70dc2eb3165b306dab7c34fcb4f2c04646ba Mon Sep 17 00:00:00 2001
From: Antony Riley <antony@cyberiantiger.org> From: Antony Riley <antony@cyberiantiger.org>
Date: Tue, 29 Mar 2016 08:22:55 +0300 Date: Tue, 29 Mar 2016 08:22:55 +0300
Subject: [PATCH] Sanitise RegionFileCache and make configurable. Subject: [PATCH] Sanitise RegionFileCache and make configurable.

Datei anzeigen

@ -1,4 +1,4 @@
From 9612faedc986c334b3f3b434b1b41e6b27f6d440 Mon Sep 17 00:00:00 2001 From 74b44807f14bbcfb54136ec5af81eaa1e061a950 Mon Sep 17 00:00:00 2001
From: DemonWav <demonwav@gmail.com> From: DemonWav <demonwav@gmail.com>
Date: Wed, 30 Mar 2016 01:20:11 -0500 Date: Wed, 30 Mar 2016 01:20:11 -0500
Subject: [PATCH] Add getEntity by UUID API Subject: [PATCH] Add getEntity by UUID API

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden Mehr anzeigen