Remove last bit of chunk exists region file fix

CraftBukkit removed their implementation that caused this issue,
switching to Mojang's implementation which doesn't appear to share it. I
already removed the important bit in the last upstream merge, this is
just unused and unnecessary now. So we remove it.
This commit is contained in:
Zach Brown 2017-04-29 05:27:31 -05:00
parent 8b2122a291
commit 974b0afca9
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
166 changed files with 384 additions and 421 deletions

View File

@ -1,4 +1,4 @@
From 2e3b2f159778b82cd48210b44e1ce8dffeb91c78 Mon Sep 17 00:00:00 2001
From 5f5ff59c74f2094741e3cf0f5c615d34d2231005 Mon Sep 17 00:00:00 2001
From: Steve Anton <anxuiz.nx@gmail.com>
Date: Thu, 3 Mar 2016 00:09:38 -0600
Subject: [PATCH] Add PlayerInitialSpawnEvent
@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerInitialSpawnEvent
For modifying a player's initial spawn location as they join the server
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index d778eafb3..d6a2bbc08 100644
index 80bf61164..59c7e78b8 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -104,6 +104,21 @@ public abstract class PlayerList {
@ -32,5 +32,5 @@ index d778eafb3..d6a2bbc08 100644
entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
String s1 = "local";
--
2.12.2
2.12.2.windows.2

View File

@ -1,37 +0,0 @@
From 9d265dc548c5d1e3df9129a15865e70b1597451d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 2 Mar 2016 23:51:51 -0600
Subject: [PATCH] Don't create Region File's when checking if chunk exists
Plugins like Dynmap can end up creating tons of emtpy Region Files
when using chunkExists.
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
index 6ec72689c..0163a4e59 100644
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
@@ -12,7 +12,13 @@ public class RegionFileCache {
public static final Map<File, RegionFile> a = Maps.newHashMap(); // Spigot - private -> public
+ // Paper start
public static synchronized RegionFile a(File file, int i, int j) {
+ return a(file, i, j, true);
+ }
+
+ public static synchronized RegionFile a(File file, int i, int j, boolean create) {
+ // Paper end
File file1 = new File(file, "region");
File file2 = new File(file1, "r." + (i >> 5) + "." + (j >> 5) + ".mca");
RegionFile regionfile = (RegionFile) RegionFileCache.a.get(file2);
@@ -20,6 +26,7 @@ public class RegionFileCache {
if (regionfile != null) {
return regionfile;
} else {
+ if (!create && !file2.exists()) { return null; } // Paper
if (!file1.exists()) {
file1.mkdirs();
}
--
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 1c4b779cc2accfe5eae2d1435bdf0e1e2a74f319 Mon Sep 17 00:00:00 2001
From d76321993eecd60cc0a0410ff8b45a0303134b81 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 01:13:45 -0600
Subject: [PATCH] Disable chest cat detection
@ -35,5 +35,5 @@ index c75ed8a36..9c4d1c938 100644
EntityOcelot entityocelot;
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From acaa4a559a33fe2e2dae4fb4f59aaea68ff00490 Mon Sep 17 00:00:00 2001
From c121bda3726ac920a54e7d3462c86cc16e114a8c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 01:17:12 -0600
Subject: [PATCH] Ensure commands are not ran async
@ -82,5 +82,5 @@ index 0f77d0674..5302bb283 100644
return true;
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 71575ec7e7c01c6ffae6465bb584e0bbb5d4e109 Mon Sep 17 00:00:00 2001
From 6b81f8f28de16733bff9a2d833a2397f6af7fe9e Mon Sep 17 00:00:00 2001
From: vemacs <d@nkmem.es>
Date: Thu, 3 Mar 2016 01:19:22 -0600
Subject: [PATCH] All chunks are slime spawn chunks toggle
@ -33,5 +33,5 @@ index 8fb14d6b5..c68429fb1 100644
}
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 0a119adb2127be5db1c6efba9c6cfeeecc3926d4 Mon Sep 17 00:00:00 2001
From 3cca34b5a315231f82eaf848a700b684e4263560 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 02:02:07 -0600
Subject: [PATCH] Optimize Pathfinding
@ -47,5 +47,5 @@ index 4f28b8819..43b2be505 100644
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 082fa781df2dfffd7b1774cfe10089544daa70a9 Mon Sep 17 00:00:00 2001
From 0c1ce95af25b8c95b34c255e9c0a440d64a100d7 Mon Sep 17 00:00:00 2001
From: CullanP <cullanpage@gmail.com>
Date: Thu, 3 Mar 2016 02:13:38 -0600
Subject: [PATCH] Avoid hopper searches if there are no items
@ -95,5 +95,5 @@ index b80f95159..e1fc4ea6c 100644
while (iterator.hasNext()) {
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From ccbbc6329f8ab2240eabdc1e2eb4bdc5e3e29834 Mon Sep 17 00:00:00 2001
From bf934f8ce2b8aed42e8412904cf5bd84f5163e3d Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Thu, 3 Mar 2016 02:15:57 -0600
Subject: [PATCH] Expose server CommandMap
@ -17,5 +17,5 @@ index 5302bb283..cab671d68 100644
return commandMap;
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From ae0cf0afb053eb18ce36346f330d8940c9f8aeea Mon Sep 17 00:00:00 2001
From a95f24eee446165a8c8006583b0de0f793c168da Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Thu, 3 Mar 2016 02:18:39 -0600
Subject: [PATCH] Be a bit more informative in maxHealth exception
@ -21,5 +21,5 @@ index 27cd0d43d..61032eb2f 100644
if (health == 0) {
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From ca1b52f9e3a17711934151e7ff7a2af41d700320 Mon Sep 17 00:00:00 2001
From 1de05f6089976c4332bb594dfcae72d598747e42 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Thu, 3 Mar 2016 02:32:10 -0600
Subject: [PATCH] Player Tab List and Title APIs
@ -78,7 +78,7 @@ index 7bcafa8bb..4f6c1c2e7 100644
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
index 16dcaba3f..0e7086da3 100644
index c86a48070..0df01186f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1,5 +1,6 @@
@ -175,5 +175,5 @@ index 16dcaba3f..0e7086da3 100644
public String getDisplayName() {
return getHandle().displayName;
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 20d8fcc6f23ec8125341558bdf29c7dc015258b1 Mon Sep 17 00:00:00 2001
From 3a9666f74e085cef316955a628fb5dbd7c63c214 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:33:53 -0600
Subject: [PATCH] Ensure inv drag is in bounds
@ -18,5 +18,5 @@ index 686250ea8..b826089d1 100644
itemstack1 = playerinventory.getCarried();
if (slot != null && a(slot, itemstack1, true) && slot.isAllowed(itemstack1) && (this.dragType == 2 || itemstack1.getCount() > this.h.size()) && this.b(slot)) {
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 87607d3f2bf2e768f4e192bd97576dd95fe3efd5 Mon Sep 17 00:00:00 2001
From 19528dbbeee2a72cb791ff414a47e84fd9e30efb Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:39:54 -0600
Subject: [PATCH] Change implementation of (tile)entity removal list
@ -84,5 +84,5 @@ index a1cdcd71b..354a7309b 100644
this.f.clear();
this.l();
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From d04bed0a2739870f17f68f432a430319d515e2d9 Mon Sep 17 00:00:00 2001
From c7880597e2dfa64fde32529848c07aff78bad349 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:46:17 -0600
Subject: [PATCH] Add configurable portal search radius
@ -54,5 +54,5 @@ index 1d5dce10e..7ca2617a8 100644
private boolean canCreatePortal = true;
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From e5d75fd43f1e772df59e499fced596ef2eefdb25 Mon Sep 17 00:00:00 2001
From c310ea8c337901ad0bfa65949f78a0716a7fd0e0 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:48:12 -0600
Subject: [PATCH] Add velocity warnings
@ -58,5 +58,5 @@ index 3ed983cc0..6384d50e7 100644
log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" );
dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().primaryThread.getId(), Integer.MAX_VALUE ), log );
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From fa4d2110a0ca3cc431097ca324b6e370212f8ac4 Mon Sep 17 00:00:00 2001
From c91c1828836d0c7465029ed20177dcb79f267005 Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com>
Date: Thu, 3 Mar 2016 02:50:31 -0600
Subject: [PATCH] Fix inter-world teleportation glitches
@ -25,7 +25,7 @@ index 4cc74cd65..fa49397ea 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 0e7086da3..d72ff0af2 100644
index 0df01186f..88fcadbfd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -579,7 +579,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -39,5 +39,5 @@ index 0e7086da3..d72ff0af2 100644
return true;
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 810379dfd7052f869995fd68b8e139a640b10899 Mon Sep 17 00:00:00 2001
From cbc43c201ce24ad2ba92a6720ec15fade9c971ef Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 03:15:41 -0600
Subject: [PATCH] Add exception reporting event
@ -225,7 +225,7 @@ index 8d1b65885..5f9678aad 100644
}
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
index 0163a4e59..57d6443cd 100644
index 6ec72689c..02b9bc8df 100644
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
@@ -1,5 +1,6 @@
@ -235,7 +235,7 @@ index 0163a4e59..57d6443cd 100644
import com.google.common.collect.Maps;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -75,6 +76,7 @@ public class RegionFileCache {
@@ -68,6 +69,7 @@ public class RegionFileCache {
}
} catch (IOException ioexception) {
ioexception.printStackTrace();

View File

@ -1,4 +1,4 @@
From 7c5e2edf7bd7a935b905f4ddd48137c861634f8d Mon Sep 17 00:00:00 2001
From 517b94fca16325f04702e129596f9d9f1fa4a50a Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Tue, 8 Mar 2016 18:28:43 -0800
Subject: [PATCH] Don't nest if we don't need to when cerealising text
@ -26,5 +26,5 @@ index 9fc83c4a3..b3b13ba11 100644
packetdataserializer.a(this.a);
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 94c3548d2ce0fa0ab60e04d21caf2c842eca3df3 Mon Sep 17 00:00:00 2001
From 60f5daf8819357295a0fe9cbf2c9e6eaed5832d3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 8 Mar 2016 23:25:45 -0500
Subject: [PATCH] Disable Scoreboards for non players by default
@ -49,5 +49,5 @@ index 5b5e0e73c..be54c807b 100644
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 6d83a42776d8dcc58a966d6f8da8b5056c273026 Mon Sep 17 00:00:00 2001
From b8425c39d7e6296671d9ddc5862172ab9da70d57 Mon Sep 17 00:00:00 2001
From: mrapple <tony@oc.tc>
Date: Sun, 25 Nov 2012 13:43:39 -0600
Subject: [PATCH] Add methods for working with arrows stuck in living entities
@ -43,5 +43,5 @@ index 61032eb2f..348a8c758 100644
+ // Paper end
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From db92fcc38686e0be97b3244eb5eae2e6da8966e1 Mon Sep 17 00:00:00 2001
From 258b0dd3501ba87edaadf75dc2bd065a29753105 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 4 Apr 2015 23:17:52 -0400
Subject: [PATCH] Complete resource pack API
@ -23,7 +23,7 @@ index 57879c76d..b67837dd2 100644
// CraftBukkit end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d72ff0af2..5fd5e39fa 100644
index 88fcadbfd..dd8380f71 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -74,6 +74,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -71,5 +71,5 @@ index d72ff0af2..5fd5e39fa 100644
private final Player.Spigot spigot = new Player.Spigot()
{
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From cfd598467afa046d6f71df7841c168df4758dca1 Mon Sep 17 00:00:00 2001
From 6faebb0cebf9a14b2b752145de89394a16604e53 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 4 Mar 2016 18:18:37 -0600
Subject: [PATCH] Chunk save queue improvements

View File

@ -1,4 +1,4 @@
From 1a4ce4dfb31730e1359640c638688cbba006b68c Mon Sep 17 00:00:00 2001
From 215acca8d61ac2957f84dc40dfda8bdf6ed7b14a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 4 Mar 2013 23:46:10 -0500
Subject: [PATCH] Chunk Save Reattempt

View File

@ -1,4 +1,4 @@
From 2cbb25a2774f83799823fe7362f067609bdffc0c Mon Sep 17 00:00:00 2001
From 0c3c5d0949ca3e6635a5935f5e9cb162b6e28fa7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 13:17:38 -0400
Subject: [PATCH] Default loading permissions.yml before plugins
@ -51,5 +51,5 @@ index 28da39cbd..9df6c0ebb 100644
CraftDefaultPermissions.registerCorePermissions();
helpMap.initializeCommands();
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From c17904b073dbf431afdc19c4dc09f444ad6ecb6c Mon Sep 17 00:00:00 2001
From 1b592b3b573635540cf12d730926ede918b22e19 Mon Sep 17 00:00:00 2001
From: William <admin@domnian.com>
Date: Fri, 18 Mar 2016 03:30:17 -0400
Subject: [PATCH] Allow Reloading of Custom Permissions
@ -32,5 +32,5 @@ index 9df6c0ebb..e77307c35 100644
+ // Paper end
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From ef440adcb9e263901028407fe1ad0d2e02f2435c Mon Sep 17 00:00:00 2001
From 6ad5adc9ed459e196fc415dba3914509def9b240 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 13:50:14 -0400
Subject: [PATCH] Remove Metadata on reload
@ -26,5 +26,5 @@ index e77307c35..4d761d32a 100644
commandMap.clearCommands();
resetRecipes();
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 2c430290f17c86c477c2c7a7d267fd23ddfbba3f Mon Sep 17 00:00:00 2001
From 1e3c4136cd2e9eec214fb9b730c3a01e486d841c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 14:19:19 -0400
Subject: [PATCH] Undead horse leashing
@ -33,5 +33,5 @@ index d74ccd68d..3416c7a7d 100644
protected void q(float f) {
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From f9d6774c585cdc37c69b774d8afee693a95dda02 Mon Sep 17 00:00:00 2001
From 1f5e3b8cd3c4a90bd433b56172f9b84f11eb65ed Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 14:24:53 -0400
Subject: [PATCH] Fix Furnace cook time bug
@ -22,5 +22,5 @@ index 2f1f3edf5..e230d1608 100644
this.burn();
flag1 = true;
--
2.12.2
2.12.2.windows.2

View File

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

View File

@ -1,4 +1,4 @@
From ccd2974a83c4fae5d48a01486ab8b8dffe414363 Mon Sep 17 00:00:00 2001
From f97a0149fe312629f4b29fce2ac49eacc0456754 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 15:12:22 -0400
Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
@ -37,5 +37,5 @@ index 65689f26d..8cda47518 100644
}
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From cc98ddd19cc2afe5d8afcd704383ead8d44c36fd Mon Sep 17 00:00:00 2001
From e6cab2b2737495bda0da7f5bea283749cf2d99be Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 20:16:03 -0400
Subject: [PATCH] Add World Util Methods
@ -93,5 +93,5 @@ index cc7369e52..1d2d174e8 100644
// CraftBukkit start - tree generation
if (captureTreeGeneration) {
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From f9f7cf2e61b9417615c1eec1229bb54569db0d0d Mon Sep 17 00:00:00 2001
From ca1b25eea56895788212adb3ecb23dedc8ae132c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 21:22:56 -0400
Subject: [PATCH] Optimized Light Level Comparisons
@ -131,5 +131,5 @@ index 897882c97..970fabf71 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())) {
this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 2914df909b71dac220c18c9b220de90f2fce300c Mon Sep 17 00:00:00 2001
From 7cb360d7aec57c15e7ce8b669d28fd9de086ffc3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 19 Mar 2016 15:16:54 -0400
Subject: [PATCH] Pass world to Village creation
@ -32,5 +32,5 @@ index 2ab381d50..817c836c3 100644
this.d = BlockPosition.ZERO;
this.j = Maps.newHashMap();
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 37773c2d575050daa8addd625bf40b28ee74a5a0 Mon Sep 17 00:00:00 2001
From c267a846efc3860d0dd8c2664eb5363fcf2c2f01 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 21 Jun 2015 15:07:20 -0400
Subject: [PATCH] Custom replacement for eaten items
@ -46,5 +46,5 @@ index 247224117..9cb3b22fb 100644
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 376c4082cf93f2688de0d051a121f20b5c8ba326 Mon Sep 17 00:00:00 2001
From 4cea4a67fa45178c59807df4f21b86b09b88574e Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 19 Jul 2015 16:51:38 -0400
Subject: [PATCH] Set health before death event
@ -45,5 +45,5 @@ index 348a8c758..c0103cb39 100644
public double getMaxHealth() {
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 04de121f6f8d6af28cb652b11cd17feec668ce9e Mon Sep 17 00:00:00 2001
From 59332750bfa25c9dafc31afa9d52f2442ec5205f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 27 Sep 2015 01:18:02 -0400
Subject: [PATCH] handle NaN health/absorb values and repair bad data
@ -44,7 +44,7 @@ index 9cb3b22fb..c70f14a15 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 5fd5e39fa..80a6a0b41 100644
index dd8380f71..0a9e8b9cd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1398,6 +1398,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -56,5 +56,5 @@ index 5fd5e39fa..80a6a0b41 100644
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From a5080daa55ef68c39c367086483795eb455cf451 Mon Sep 17 00:00:00 2001
From 7a4c9cc8f43dd8cb13ceafc6b4360c58a40c5e7a Mon Sep 17 00:00:00 2001
From: Daniel Ennis <dennis@icontact.com>
Date: Sun, 20 Mar 2016 15:22:42 -0400
Subject: [PATCH] Catch Async PlayerChunkMap operations
@ -22,5 +22,5 @@ index 9012a63a0..5b27bd1c5 100644
long i = d(chunkcoordintpair.x, chunkcoordintpair.z);
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 139e93117fa8452adb2be851e7dd957dd824d702 Mon Sep 17 00:00:00 2001
From 08efbaa590f1d22457b23dac04cc88535f84da74 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 21 Mar 2016 00:19:18 -0500
Subject: [PATCH] Support offline mode in whitelist command as well
@ -89,5 +89,5 @@ index c74d1d2be..0f4237db1 100644
+ // Paper end
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 41e002267b87e75db128ca73dec84b7636afde2b Mon Sep 17 00:00:00 2001
From b15951b4c90b25f3db552de1d9032a5daf99fc43 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 5 Jan 2016 21:48:24 -0500
Subject: [PATCH] Fix SkullCache case bug
@ -18,5 +18,5 @@ index 91ca4a279..edd6fb69e 100644
callback.apply(profile);
} else {
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From ba98d3629b53c82bc96d097c0ee3086345af2300 Mon Sep 17 00:00:00 2001
From 9db8303c4d0edf7f783e2f8656b2f8f68fae80cb Mon Sep 17 00:00:00 2001
From: Gabscap <sonstige.netzwerke@gabriel-paradzik.de>
Date: Sat, 19 Mar 2016 22:25:11 +0100
Subject: [PATCH] Waving banner workaround
@ -34,5 +34,5 @@ index c5c3f40ce..6413f76e7 100644
public void a(PacketDataSerializer packetdataserializer) throws IOException {
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 7db79cee3f3587bced0e3d249bb50aa4ee3b1fef Mon Sep 17 00:00:00 2001
From ce002ce8991131c9acfba45b64c942a8b97b932d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 22 Mar 2016 00:33:47 -0400
Subject: [PATCH] Use a Shared Random for Entities
@ -27,5 +27,5 @@ index be54c807b..42bd79b10 100644
this.justCreated = true;
this.uniqueID = MathHelper.a(this.random);
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 978d5af9bceeb871be2b1cbfffb45f9de62b5636 Mon Sep 17 00:00:00 2001
From 3a9555ca894972a6e5c4e7bb7bf5d1e616235334 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 22 Mar 2016 00:55:23 -0400
Subject: [PATCH] Don't teleport dead entities
@ -20,5 +20,5 @@ index 42bd79b10..70a431a63 100644
WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
int i = worldserver1.dimension;
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 15890a007fe5797522d8b42f028835b2b2ff6d05 Mon Sep 17 00:00:00 2001
From 580a3c1e39db0c716b97f47e00d39ebd145d9d1c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 27 Aug 2015 01:15:02 -0400
Subject: [PATCH] Optimize Chunk Access
@ -9,7 +9,7 @@ getChunkAt is called for the same chunk multiple times in a row, often from getT
Optimize this look up by using a Last Access cache.
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index b0a82e7ed..a7e8a3f7d 100644
index 0ad57afba..b49f4e292 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -27,7 +27,27 @@ public class ChunkProviderServer implements IChunkProvider {
@ -42,5 +42,5 @@ index b0a82e7ed..a7e8a3f7d 100644
public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) {
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 4bc32176e261712428bd91475ec9a4da500a582d Mon Sep 17 00:00:00 2001
From 76935253a4bfcc967fde6cc7d3e034f537c6160d Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 22 Mar 2016 12:04:28 -0500
Subject: [PATCH] Configurable spawn chances for skeleton horses
@ -32,5 +32,5 @@ index ac8dc5f2f..39ed0d533 100644
entityhorseskeleton.p(true);
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 22e1661666d7e149b0fddf9a6f45cad52af4b917 Mon Sep 17 00:00:00 2001
From a76eee72a3134e780d7e75a0705c1db66c5e21e4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 02:07:55 -0600
Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@ -255,5 +255,5 @@ index 1d2d174e8..9427fc080 100644
} else {
Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4);
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From c4390170763cc895adafa3fd63614c0423b6a761 Mon Sep 17 00:00:00 2001
From 0dcc62d3626178628c8a2f9e1c55a7a1d6e97ab7 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 1 Mar 2016 04:32:08 -0500
Subject: [PATCH] Fix cooked fish legacy import
@ -18,5 +18,5 @@ index 87b82eb35..a7c71f406 100644
DataConverterMaterialId.a[352] = "minecraft:bone";
DataConverterMaterialId.a[353] = "minecraft:sugar";
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 52393541b308a635b69f891b01eb41c1776e8f07 Mon Sep 17 00:00:00 2001
From 9a9ff76273935fe0116ddb2fd757452542354c51 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 20 Mar 2016 06:45:01 -0400
Subject: [PATCH] Access items by EquipmentSlot
@ -64,5 +64,5 @@ index 67c54899d..3f58c34e0 100644
+ // Paper end
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 931dd1b6fbddd6576e436007a749078ceae64f1a Mon Sep 17 00:00:00 2001
From 5d65ae660c3bc6c62f38dc327121df456f8b9e32 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 27 Mar 2016 20:24:05 -0500
Subject: [PATCH] Check async, remove unused vars, GH-159
@ -28,5 +28,5 @@ index c79fb7d57..8749a1879 100644
if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 256) {
BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From c80433172ca35367589f748c6ac3a0270f33b8f3 Mon Sep 17 00:00:00 2001
From fb9b6e2de28107a733bfc5b55b4d446e115027fd Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 19:55:45 -0400
Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
@ -67,5 +67,5 @@ index 39ed0d533..f969d2a72 100644
timing.stopTiming(); // Paper
} else {
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From e87ca8c0409093b76e27c0077e2b3a86c26e045b Mon Sep 17 00:00:00 2001
From 92c341a06e29d044aae2b75fa6b940613ab4744f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 20:32:58 -0400
Subject: [PATCH] Entity AddTo/RemoveFrom World Events
@ -25,5 +25,5 @@ index 8cbdbda92..f86c64cb2 100644
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 2f4d4c62f46ec42fef570d76224b5e12257eb95b Mon Sep 17 00:00:00 2001
From 49abb603029c245c5d3946c3a941437ceeae0c3c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 20:46:14 -0400
Subject: [PATCH] Configurable Chunk Inhabited Timer
@ -36,5 +36,5 @@ index 736fa1f62..61d34fc37 100644
public void c(long i) {
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 45f66cc197d1dcd2090286f05210c9acef78ca40 Mon Sep 17 00:00:00 2001
From 8b31a83fcf313a58a3d2657eb4a618fe27452a35 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 21:22:26 -0400
Subject: [PATCH] EntityPathfindEvent
@ -35,5 +35,5 @@ index 43b2be505..c0ef2400b 100644
float f = this.h();
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 063a6b2a26bfabac382e663575b0a98e517346d9 Mon Sep 17 00:00:00 2001
From 58e7452d99c66366f890d624f3ee8315fe87eb8c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 22:03:09 -0400
Subject: [PATCH] Prevent Waterflow BlockFromToEvent from loading chunks
@ -48,5 +48,5 @@ index 0a2823686..8eba70b01 100644
if (this.material == Material.LAVA) {
this.fizz(world, blockposition);
--
2.12.2
2.12.2.windows.2

View File

@ -1,11 +1,11 @@
From 5fd361c508284348b1fe96835571b9d871da0ddc Mon Sep 17 00:00:00 2001
From 4e9603ee0e06578012952c18fe907aff009b583c Mon Sep 17 00:00:00 2001
From: Antony Riley <antony@cyberiantiger.org>
Date: Tue, 29 Mar 2016 06:56:23 +0300
Subject: [PATCH] Reduce IO ops opening a new region file.
diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
index 9cfc46bc2..637e5baaf 100644
index ed840dbc9..4008a2143 100644
--- a/src/main/java/net/minecraft/server/RegionFile.java
+++ b/src/main/java/net/minecraft/server/RegionFile.java
@@ -8,9 +8,12 @@ import java.io.ByteArrayInputStream;
@ -49,5 +49,5 @@ index 9cfc46bc2..637e5baaf 100644
}
} catch (IOException ioexception) {
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 61c14766f4cf6eb0ac45cfcd60aae9fdcba217e8 Mon Sep 17 00:00:00 2001
From e9bec1384df97f7d694ebfa1dad07e0ae0e3faab Mon Sep 17 00:00:00 2001
From: Antony Riley <antony@cyberiantiger.org>
Date: Tue, 29 Mar 2016 08:22:55 +0300
Subject: [PATCH] Sanitise RegionFileCache and make configurable.
@ -25,7 +25,7 @@ index 6907d4680..c3ff47e00 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
index 19fbf9b4a..ad00c39ce 100644
index 02b9bc8df..91b55074e 100644
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
@@ -8,10 +8,12 @@ import java.io.File;
@ -40,9 +40,9 @@ index 19fbf9b4a..ad00c39ce 100644
- public static final Map<File, RegionFile> a = Maps.newHashMap(); // Spigot - private -> public
+ public static final Map<File, RegionFile> a = new LinkedHashMap(PaperConfig.regionFileCacheSize, 0.75f, true); // Spigot - private -> public, Paper - HashMap -> LinkedHashMap
// Paper start
public static synchronized RegionFile a(File file, int i, int j) {
@@ -32,8 +34,8 @@ public class RegionFileCache {
File file1 = new File(file, "region");
@@ -25,8 +27,8 @@ public class RegionFileCache {
file1.mkdirs();
}
@ -53,7 +53,7 @@ index 19fbf9b4a..ad00c39ce 100644
}
RegionFile regionfile1 = new RegionFile(file2);
@@ -64,6 +66,22 @@ public class RegionFileCache {
@@ -57,6 +59,22 @@ public class RegionFileCache {
}
}
@ -77,5 +77,5 @@ index 19fbf9b4a..ad00c39ce 100644
Iterator iterator = RegionFileCache.a.values().iterator();
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 0d5d2097b72aa92d7199dd4b84adc080cb9df775 Mon Sep 17 00:00:00 2001
From bf55746ae8469ec426c19372f7fd267fc13b976e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 30 Mar 2016 02:13:24 -0400
Subject: [PATCH] Use Optimized Collections
@ -13,7 +13,7 @@ These collections are super fast as seen
http://java-performance.info/hashmap-overview-jdk-fastutil-goldman-sachs-hppc-koloboke-trove-january-2015/
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index a7e8a3f7d..54b454fe3 100644
index b49f4e292..dd37bec73 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -24,7 +24,7 @@ import org.bukkit.event.world.ChunkUnloadEvent;
@ -47,5 +47,5 @@ index 419add5db..820c15278 100644
private boolean f = true;
private boolean g;
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 22757113dc8d4014c7fe8ef4fb3d8a734fddf9fe Mon Sep 17 00:00:00 2001
From 0528c8e87adbb3e0ca9714a8c7cdada59d34319a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 31 Mar 2016 19:17:58 -0400
Subject: [PATCH] Do not load chunks for light checks
@ -19,5 +19,5 @@ index f86c64cb2..7e6459654 100644
Chunk chunk = this.getChunkAtWorldCoords(blockposition);
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From a143c953207c29ed4c31626f8a19e2aaa5ef72c0 Mon Sep 17 00:00:00 2001
From ce229663241dcac2571047f5a1c9af02acd3c1c3 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 2 Apr 2016 05:09:16 -0400
Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@ -39,5 +39,5 @@ index b67837dd2..840448995 100644
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,11 +1,11 @@
From a93413a68948fca1c6565e2998d21c76031a7f04 Mon Sep 17 00:00:00 2001
From 797ffb13230f48f427a2a5e354dce5cc853ae481 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 2 Apr 2016 20:37:03 -0400
Subject: [PATCH] Fix reducedDebugInfo not initialized on client
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index d6a2bbc08..b8d48b45c 100644
index 59c7e78b8..e303b45f0 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -154,6 +154,7 @@ public abstract class PlayerList {
@ -17,5 +17,5 @@ index d6a2bbc08..b8d48b45c 100644
entityplayer.getStatisticManager().d();
entityplayer.getStatisticManager().updateStatistics(entityplayer);
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 2239e93f9ca22ddb356ed4ee329aae51355d6a5d Mon Sep 17 00:00:00 2001
From 408594ec2da3c56bb04e5789c7fb2ccaa85dd7c2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 3 Apr 2016 16:28:17 -0400
Subject: [PATCH] Configurable Grass Spread Tick Rate
@ -32,5 +32,5 @@ index 8b43e6070..5cbc95f7c 100644
int lightLevel = -1; // Paper
if (world.getType(blockposition.up()).c() > 2 && (lightLevel = world.getLightLevel(blockposition.up())) < 4) { // Paper - move light check to end to avoid unneeded light lookups
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 02aceb5c58c3c99427fbc68765cf7ce5340d477d Mon Sep 17 00:00:00 2001
From f825c7818bd1558c1371f174a954545f6959d539 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 13 Sep 2014 23:14:43 -0400
Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@ -83,5 +83,5 @@ index f65611a6a..9965235ab 100644
loadChunk(chunkCoordX + x, chunkCoordZ + z);
} else {
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From a22863594140aa2beb47672cc81f2eeca3a4424c Mon Sep 17 00:00:00 2001
From a5d5dda4e43b4daafab005b8cf63e5eb148ebd56 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 3 Apr 2016 17:48:50 -0400
Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
@ -17,5 +17,5 @@ index dba3fb167..44108ab9a 100644
this.a(blockposition.east(), block, blockposition);
this.a(blockposition.down(), block, blockposition);
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From b45bff5ab25d652697981a8e08b69d4d52edf888 Mon Sep 17 00:00:00 2001
From 76d4bbc0f57b08ce52b6d3a4f3da9c7dc720c6e4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 5 Apr 2016 19:42:22 -0400
Subject: [PATCH] Don't spam reload spawn chunks in nether/end
@ -29,5 +29,5 @@ index a27512c0f..4691b3d8f 100644
}
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 09e2228c9837b20fdc95318fbe4e2a2d8a396f57 Mon Sep 17 00:00:00 2001
From bc6666b8fea7c026847ea036395301569eae5fa2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 5 Apr 2016 21:38:58 -0400
Subject: [PATCH] Remove Debug checks from DataBits
@ -42,5 +42,5 @@ index f3a6799a8..fa0fd8a9c 100644
int k = j / 64;
int l = ((i + 1) * this.b - 1) / 64;
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 961fafdaceab970599d69a51dd78cb93a0d93a25 Mon Sep 17 00:00:00 2001
From c9d7dd9e35bd8ad3ec1b3ced918e0fdb1dae60b3 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 6 Apr 2016 01:04:23 -0500
Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@ -51,5 +51,5 @@ index 840448995..dfbae01f4 100644
if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
for (Object recipient : minecraftServer.getPlayerList().players) {
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 5fa0344f756b199b838d8addb7e3f50efe5a4f91 Mon Sep 17 00:00:00 2001
From e5988d5b1cd40ac1a8b4fa2868e5214516b99c73 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 10 Apr 2016 03:23:32 -0500
Subject: [PATCH] Workaround for setting passengers on players
@ -6,7 +6,7 @@ Subject: [PATCH] Workaround for setting passengers on players
SPIGOT-1915 & GH-114
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 80a6a0b41..5f6b182d6 100644
index 0a9e8b9cd..8e06c2140 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -589,6 +589,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -28,5 +28,5 @@ index 80a6a0b41..5f6b182d6 100644
public void setSneaking(boolean sneak) {
getHandle().setSneaking(sneak);
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From dcfc848c896f88a21c47d10b8e5914bdeeda4321 Mon Sep 17 00:00:00 2001
From 0ee8a42416c06bb0ac9c29ab71474a8f97e0006f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 13 Apr 2016 00:25:28 -0400
Subject: [PATCH] Remove unused World Tile Entity List
@ -67,5 +67,5 @@ index 9bc8ce64c..2f4728b0d 100644
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 421db0871b70be8fbcee14ef32188a132e5e12d2 Mon Sep 17 00:00:00 2001
From 6f8419e69afc9f0873ee2f8d073fa6aee9c9ff7b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 13 Apr 2016 00:30:10 -0400
Subject: [PATCH] Don't tick Skulls - unused code
@ -18,5 +18,5 @@ index edd6fb69e..380373c0e 100644
private int a;
public int rotation;
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 6e0a59b05544ff285c2775c54e01c0a5b08c8371 Mon Sep 17 00:00:00 2001
From 5c7d4a23609617b8822fa851a9550b15a8bcf6ee Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 13 Apr 2016 02:10:49 -0400
Subject: [PATCH] Configurable Player Collision

View File

@ -1,4 +1,4 @@
From 3112e052aea6a52a5959ddef046c307f09443bbd Mon Sep 17 00:00:00 2001
From 5b040a6ee5d97a584ea1875d45f251066eb51e79 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Wed, 13 Apr 2016 20:21:38 -0700
Subject: [PATCH] Add handshake event to allow plugins to handle client
@ -45,5 +45,5 @@ index a46df4b7f..f02263c34 100644
if ( split.length == 3 || split.length == 4 ) {
packethandshakinginsetprotocol.hostname = split[0];
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From b5d0b73e9f5dc13affbd3c6fa857fe45deeaaa19 Mon Sep 17 00:00:00 2001
From adfe939e1377279c32fe68488f5285302613c9ba Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 14 Apr 2016 17:48:56 -0500
Subject: [PATCH] Water mobs should only spawn in the water
@ -26,5 +26,5 @@ index 90d33af95..251555713 100644
public boolean canSpawn() {
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 0e4f44dde4037101a88ba017da160589dbf53b9e Mon Sep 17 00:00:00 2001
From ce270a9774afd4425f09187b3dae122dab3a8943 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 14 Apr 2016 21:01:39 -0400
Subject: [PATCH] Fix Bugs with Spigot Mob Spawn Logic
@ -56,5 +56,5 @@ index 8749a1879..29d4c0866 100644
Iterator iterator1 = this.b.iterator();
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 3cc6bf088a830f76ece5e6bb0c607c16278258cc Mon Sep 17 00:00:00 2001
From 82d1f04f8a674ab31b52e27e1987cd1785acf94d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 16 Apr 2016 00:39:33 -0400
Subject: [PATCH] Configurable RCON IP address
@ -19,5 +19,5 @@ index a6a0d5a29..efcafe77f 100644
if (0 == this.h) {
this.h = this.i + 10;
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 73b1b9d098df385f6eaad2694a09d0ad1b967c06 Mon Sep 17 00:00:00 2001
From 0cf6a91a4ecb498d0867e197dbffb42a5280a096 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 17 Apr 2016 17:27:09 -0400
Subject: [PATCH] Prevent Fire from loading chunks
@ -47,5 +47,5 @@ index 94cb9d462..dfc328850 100644
return i;
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 230b15e3cf0ecccba8688946cc029fd5d3a4a54d Mon Sep 17 00:00:00 2001
From facac094d3f1909ca5c2d0100b0f343591690b5c Mon Sep 17 00:00:00 2001
From: Isaac Moore <rmsy@me.com>
Date: Tue, 19 Apr 2016 14:09:31 -0500
Subject: [PATCH] Implement PlayerLocaleChangeEvent

View File

@ -1,4 +1,4 @@
From aef8810f99eda6a4fd16bb1dfdb0b03100e36362 Mon Sep 17 00:00:00 2001
From 0be7d9227878e2d4b44885aa146bdbd64bda3fc5 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 22 Apr 2016 01:43:11 -0500
Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@ -41,5 +41,5 @@ index b6e978668..8d95d148f 100644
this.foodTickTimer = 0;
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 4166ec0c617ad78d508f015a1d4da5199641c20f Mon Sep 17 00:00:00 2001
From 6a3db8a7752bb7e49c4577771c3b92c763c0e159 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Thu, 21 Apr 2016 23:51:55 -0700
Subject: [PATCH] Add ability to configure frosted_ice properties
@ -44,5 +44,5 @@ index 73855826e..f079c3389 100644
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 49d999a37165c4441c7479b021a7768a2f2d0c31 Mon Sep 17 00:00:00 2001
From 293a7018d32c2e0e9aaf9eb4080530122a83d5fa Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 22 Apr 2016 18:20:05 -0500
Subject: [PATCH] Vehicle Event Cancellation Changes
@ -41,5 +41,5 @@ index 8908d8b8d..0f4a1b66b 100644
entity.j = 60;
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From fbebca9bf7a3e0aa8517e1009a3336ab8246e77c Mon Sep 17 00:00:00 2001
From 043c470686058669deac012958193f1bddfa2a10 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 24 Apr 2016 19:49:33 -0500
Subject: [PATCH] SPIGOT-1401: Fix dispenser, dropper, furnace placement
@ -51,5 +51,5 @@ index 528005446..b0d03e408 100644
public boolean interact(World world, BlockPosition blockposition, IBlockData iblockdata, EntityHuman entityhuman, EnumHand enumhand, EnumDirection enumdirection, float f, float f1, float f2) {
if (world.isClientSide) {
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 3d13d3f46d166118a68be71adde74e57d7cb1d0f Mon Sep 17 00:00:00 2001
From bf25b8717b9a888b98fe9542ac860429350c61bb Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 27 Apr 2016 22:09:52 -0400
Subject: [PATCH] Improve Minecraft Hopper Performance
@ -86,5 +86,5 @@ index 6acce15e7..44b6ecc5d 100644
return this.f > 0;
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 062ba076f982db42212697357f485aa5d920df0a Mon Sep 17 00:00:00 2001
From 13ae7fd9680c4c26bfb24bc38f5372dab2c0f303 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 28 Apr 2016 00:57:27 -0400
Subject: [PATCH] remove null possibility for getServer singleton
@ -35,5 +35,5 @@ index 430168d21..83b62da55 100644
// CraftBukkit end
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 014e66039c805fb82717b0f6fe7c6b8d30f3699a Mon Sep 17 00:00:00 2001
From 7c6cdf790cf13759abac08cc78be4f7e82689711 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 29 Apr 2016 20:02:00 -0400
Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
@ -145,5 +145,5 @@ index 256a13178..5768cd512 100644
public RenderData() {
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 7d61f1ae6c1042b230ece85761341c36ce482e6d Mon Sep 17 00:00:00 2001
From bfc069f2e9f925c0f10d95b9cdbdd33ea8a3f8f7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 1 May 2016 21:19:14 -0400
Subject: [PATCH] LootTable API & Replenishable Lootables Feature
@ -782,5 +782,5 @@ index e9963e21c..acb4dee04 100644
CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From bd0317665aa18996d5e315cf993f1ee8c705efc8 Mon Sep 17 00:00:00 2001
From 0e544cd8d1e8174c68a97013f8898d58741d0340 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 19 Jan 2016 00:13:19 -0500
Subject: [PATCH] Do not load chunks for pathfinding
@ -18,5 +18,5 @@ index 08b986fd7..786d1dd22 100644
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From dfc386797ff567e4f4c54a63e24ddb8240df07d7 Mon Sep 17 00:00:00 2001
From d0d65d40d665bd4857968bce815a16b73fb71992 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 17 Jun 2013 01:24:00 -0400
Subject: [PATCH] Entity Tracking Improvements
@ -99,5 +99,5 @@ index fbda70a39..c28b4bd44 100644
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From c08c205ecb62164eb4e00f5356319ced19481ab3 Mon Sep 17 00:00:00 2001
From 0886e9d5e5edb0b883647a0ac6b83aa38b602b29 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 7 May 2016 23:33:08 -0400
Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
@ -31,5 +31,5 @@ index 230004b4a..62752f816 100644
nbttagcompound.setString("Name", scoreboardteam.getName());
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 540962bdce2796a369838635bbb1f15eafeb414c Mon Sep 17 00:00:00 2001
From b45938c5752cc909b6cb49cef6768cda18a5788c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 12 May 2016 01:55:17 -0400
Subject: [PATCH] Do not mark chunks as active for neighbor updates
@ -44,5 +44,5 @@ index a6cf1d83d..3db29161d 100644
if (chunk4 != null) {
chunk4.a(chunkgenerator);
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 9e02e7677c27c8b05f69b00620f98b3f6a583e31 Mon Sep 17 00:00:00 2001
From 2f0e1a92eb0215f3ea7481cc54eeaf6b8ba23cac Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 12 May 2016 02:03:56 -0400
Subject: [PATCH] Fix Chunk Unload Queue Issues
@ -22,7 +22,7 @@ index 3db29161d..98f2cff15 100644
// Paper start
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 54b454fe3..57ae50d2e 100644
index dd37bec73..eb3225ef2 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -299,6 +299,7 @@ public class ChunkProviderServer implements IChunkProvider {
@ -34,5 +34,5 @@ index 54b454fe3..57ae50d2e 100644
continue;
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 922d126f9e81684c5ca795fbbf67a7c38aaf1c18 Mon Sep 17 00:00:00 2001
From 16152841f16f55980d1d9ed723c60c33832f64c0 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 12 May 2016 23:02:58 -0500
Subject: [PATCH] System property for disabling watchdoge
@ -18,5 +18,5 @@ index 6384d50e7..cb1fcf0f4 100644
Logger log = Bukkit.getServer().getLogger();
log.log( Level.SEVERE, "The server has stopped responding!" );
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 1dc6b412b3e0bed7ef8c58885a37931bd3467f06 Mon Sep 17 00:00:00 2001
From a5d200f5f9ac0a6be1c90e383adeadc8b151e34a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 13 May 2016 01:38:06 -0400
Subject: [PATCH] Optimize EAR
@ -65,5 +65,5 @@ index c411ce886..c8a6ff3d4 100644
}
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 9541bcf765a36a89596125b143980a9565b96454 Mon Sep 17 00:00:00 2001
From f8298bd0e0b7b50c1e71d97df928320f537323e6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 16 May 2016 20:47:41 -0400
Subject: [PATCH] Optimize UserCache / Thread Safe
@ -96,5 +96,5 @@ index ccfc755d2..989758cdf 100644
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 65e18c08092da1309dc93d0853d3e80e10395ea8 Mon Sep 17 00:00:00 2001
From fe563a5eab9483cb69f2b7bfc2c750fafe263b50 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 16 May 2016 23:19:16 -0400
Subject: [PATCH] Avoid blocking on Network Manager creation
@ -43,5 +43,5 @@ index 6a71ebbd2..faf7b60af 100644
if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
{
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 82e8f7a4a44e9c66dfc85f545c4ce71cf719c1b8 Mon Sep 17 00:00:00 2001
From 4570a07bfc85628581dfb4338637c0264f34df85 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 22 May 2016 20:20:55 -0500
Subject: [PATCH] Optional old TNT cannon behaviors
@ -389,5 +389,5 @@ index d7bc6a0ed..f2785d86c 100644
EntityHuman entityhuman = (EntityHuman) entity;
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 8529869d620ac19136bca541423009322e9f3e3a Mon Sep 17 00:00:00 2001
From ae790beb03eba954c38947720990f2f273b1d4e0 Mon Sep 17 00:00:00 2001
From: Martin Panzer <postremus1996@googlemail.com>
Date: Mon, 23 May 2016 12:12:37 +0200
Subject: [PATCH] Faster redstone torch rapid clock removal
@ -39,5 +39,5 @@ index 741236289..25a2a5d36 100644
public RedstoneUpdateInfo(BlockPosition blockposition, long i) {
this.a = blockposition;
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 0f1b139badcecfe47ada01bf5a643f6691154341 Mon Sep 17 00:00:00 2001
From 7dacb06906b8a49f5fff6ac5d3e13f44e0921a4b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 27 May 2016 21:41:26 -0400
Subject: [PATCH] Ensure Chunks never ever load async
@ -42,5 +42,5 @@ index b5efb9c3f..ef9529add 100644
return;
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From b2f2babfb133493364ec75644bc1952350434355 Mon Sep 17 00:00:00 2001
From c325795fa35577349654d913c5be60aeddd6e6b4 Mon Sep 17 00:00:00 2001
From: Martin Panzer <postremus1996@googlemail.com>
Date: Sat, 28 May 2016 16:54:03 +0200
Subject: [PATCH] Add server-name parameter
@ -24,5 +24,5 @@ index 4399faf69..59d4e2e6f 100644
};
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From c2807401573c8f0758a9ce02696466bc911439c2 Mon Sep 17 00:00:00 2001
From 309f96980dba21738a6b1d9d802bc2c9f67301b4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 31 May 2016 22:53:50 -0400
Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
@ -44,5 +44,5 @@ index 9af34ba60..031507574 100644
double deltaZ = this.locZ - player.locZ;
double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 33ecb4b8cf5348bc04ebf70d86f3d0a82c06c00a Mon Sep 17 00:00:00 2001
From a57b2a20bfc3edce691470ca6def1e166dc6cfa4 Mon Sep 17 00:00:00 2001
From: Martin Panzer <postremus1996@googlemail.com>
Date: Fri, 3 Jun 2016 23:13:39 +0200
Subject: [PATCH] Fix FallingBlocks being stuck on fences
@ -102,5 +102,5 @@ index bb01929e8..8059e6dcd 100644
Block block = this.block.getBlock();
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 93a2af841f6352063d22593927b334434bae3383 Mon Sep 17 00:00:00 2001
From 5e24b91319bb930c470e28e5751d7f9b758fe063 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Sat, 18 Jun 2016 01:01:37 -0500
Subject: [PATCH] Make entities look for hoppers
@ -378,5 +378,5 @@ index 44b6ecc5d..022e64520 100644
if (!list.isEmpty()) {
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From 47bc97578256db7c8dc522c0810655ebc94b512a Mon Sep 17 00:00:00 2001
From 42eb9c7ff29419933afefaaa21c757752b817666 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 18 Jun 2016 23:22:12 -0400
Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@ -47,7 +47,7 @@ index 98f2cff15..88437d77a 100644
public final int locZ;
private boolean m;
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 57ae50d2e..0a8e09e5e 100644
index eb3225ef2..81b9bb884 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -315,6 +315,19 @@ public class ChunkProviderServer implements IChunkProvider {
@ -140,5 +140,5 @@ index 9965235ab..3f8859a1f 100644
}
--
2.12.2
2.12.2.windows.2

View File

@ -1,4 +1,4 @@
From bc29002b6c5ff86ac128aee61f9e8d08c20eeeb5 Mon Sep 17 00:00:00 2001
From dcfa2ba7251ae9627d3dda488cbdf7e3cc31892e Mon Sep 17 00:00:00 2001
From: Jadon Fowler <jadonflower@gmail.com>
Date: Sat, 18 Jun 2016 23:13:59 -0700
Subject: [PATCH] Toggleable Elytra Wall Damage
@ -41,5 +41,5 @@ index ec901150d..b8ac99e5d 100644
if (this.onGround && !this.world.isClientSide) {
if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
--
2.12.2
2.12.2.windows.2

Some files were not shown because too many files have changed in this diff Show More