Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 19:10:09 +01:00
Rebuild Patches
Dieser Commit ist enthalten in:
Ursprung
b3b0b9f24a
Commit
3e19de0cf5
@ -1,18 +1,17 @@
|
||||
From 36435f971c6a8da00ae28e14aae77a018dcda0b3 Mon Sep 17 00:00:00 2001
|
||||
From 95c78984a3ee98dd31365f97222be56243c6347d Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Fri, 1 Apr 2016 00:02:47 -0400
|
||||
Subject: [PATCH] add Trove and FastUtil to Bukkit
|
||||
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index cc8fca48..f5e8d49d 100644
|
||||
index 7374304f..a8a87820 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -54,6 +54,19 @@
|
||||
</pluginRepositories>
|
||||
@@ -55,6 +55,19 @@
|
||||
|
||||
<dependencies>
|
||||
+ <dependency>
|
||||
<dependency>
|
||||
+ <groupId>net.sf.trove4j</groupId>
|
||||
+ <artifactId>trove4j</artifactId>
|
||||
+ <version>3.0.3</version>
|
||||
@ -25,9 +24,10 @@ index cc8fca48..f5e8d49d 100644
|
||||
+ <version>1.0</version>
|
||||
+ <scope>provided</scope>
|
||||
+ </dependency>
|
||||
<dependency>
|
||||
+ <dependency>
|
||||
<groupId>commons-lang</groupId>
|
||||
<artifactId>commons-lang</artifactId>
|
||||
<version>2.6</version>
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 9a9ae4bff73c2649084dc753efa60f86ac91c2dd Mon Sep 17 00:00:00 2001
|
||||
From b05b061414eba85e69f03f7f32eda20520bcf167 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 16 Jul 2013 21:26:50 -0400
|
||||
Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin)
|
||||
@ -9,11 +9,10 @@ diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main
|
||||
index 64c0f0a7..6da6abd8 100644
|
||||
--- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
|
||||
+++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
|
||||
@@ -124,6 +124,26 @@ public abstract class MetadataStoreBase<T> {
|
||||
}
|
||||
@@ -125,6 +125,26 @@ public abstract class MetadataStoreBase<T> {
|
||||
}
|
||||
|
||||
+ /**
|
||||
/**
|
||||
+ * Removes all metadata in the metadata store that originates from the
|
||||
+ * given plugin.
|
||||
+ *
|
||||
@ -33,9 +32,10 @@ index 64c0f0a7..6da6abd8 100644
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
/**
|
||||
+ /**
|
||||
* Creates a unique name for the object receiving metadata by combining
|
||||
* unique data from the subject with a metadataKey.
|
||||
* <p>
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 47a6be4ee58f0b7650ee3f74933311d0e0dbab0e Mon Sep 17 00:00:00 2001
|
||||
From 1b18b2c31515c8ebb10f0d48e7fc21a0dc9ab23e Mon Sep 17 00:00:00 2001
|
||||
From: AlphaBlend <whizkid3000@hotmail.com>
|
||||
Date: Thu, 8 Sep 2016 08:47:08 -0700
|
||||
Subject: [PATCH] Add source to PlayerExpChangeEvent
|
||||
@ -8,7 +8,7 @@ diff --git a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java b/s
|
||||
index f37491d7..30882559 100644
|
||||
--- a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java
|
||||
@@ -1,20 +1,42 @@
|
||||
@@ -1,21 +1,43 @@
|
||||
package org.bukkit.event.player;
|
||||
|
||||
+import org.bukkit.entity.Entity; // Paper
|
||||
@ -37,7 +37,7 @@ index f37491d7..30882559 100644
|
||||
exp = expAmount;
|
||||
}
|
||||
|
||||
+ /**
|
||||
/**
|
||||
+ * Get the source that provided the experience.
|
||||
+ *
|
||||
+ * @return The source of the experience
|
||||
@ -48,9 +48,10 @@ index f37491d7..30882559 100644
|
||||
+ }
|
||||
+ // Paper end
|
||||
+
|
||||
/**
|
||||
+ /**
|
||||
* Get the amount of experience the player will receive
|
||||
*
|
||||
* @return The amount of experience
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 2b95e12f292000685d4475a372dbcb4e2c275db2 Mon Sep 17 00:00:00 2001
|
||||
From 081bc80c2faf5835d519afacaf3b303b8175ee45 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 29 Feb 2016 17:43:33 -0600
|
||||
Subject: [PATCH] Add async chunk load API
|
||||
@ -8,11 +8,10 @@ diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/Worl
|
||||
index 550c26be..121033e9 100644
|
||||
--- a/src/main/java/org/bukkit/World.java
|
||||
+++ b/src/main/java/org/bukkit/World.java
|
||||
@@ -137,6 +137,78 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
*/
|
||||
@@ -138,6 +138,78 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
public Chunk getChunkAt(Block block);
|
||||
|
||||
+ /**
|
||||
/**
|
||||
+ * Used by {@link World#getChunkAtAsync(Location,ChunkLoadCallback)} methods
|
||||
+ * to request a {@link Chunk} to be loaded, with this callback receiving
|
||||
+ * the chunk when it is finished.
|
||||
@ -84,9 +83,10 @@ index 550c26be..121033e9 100644
|
||||
+ */
|
||||
+ public void getChunkAtAsync(Block block, ChunkLoadCallback cb);
|
||||
+
|
||||
/**
|
||||
+ /**
|
||||
* Checks if the specified {@link Chunk} is loaded
|
||||
*
|
||||
* @param chunk The chunk to check
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From f43d349299401f7db1e573918c8d2ca82d4ac422 Mon Sep 17 00:00:00 2001
|
||||
From 93c75395fd5d384fc0f02ea2fd42e11dea86a507 Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sat, 21 Jul 2018 01:51:05 -0500
|
||||
Subject: [PATCH] EnderDragon Events
|
@ -1,4 +1,4 @@
|
||||
From f0c0d6c6182c1c89de1125c0c2f22559724cfaf5 Mon Sep 17 00:00:00 2001
|
||||
From 97b918f3f85ee6f8abba56461a255b7faad2627a Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sat, 21 Jul 2018 01:59:53 -0500
|
||||
Subject: [PATCH] PlayerElytraBoostEvent
|
@ -1,4 +1,4 @@
|
||||
From d3916598abd6d23f6b2e332cd987d20e80ad30f1 Mon Sep 17 00:00:00 2001
|
||||
From cb35c14704a3feefe80923f466c805b56c4f2597 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 25 Jul 2018 01:36:07 -0400
|
||||
Subject: [PATCH] Expand Location Manipulation API
|
||||
@ -62,5 +62,5 @@ index d0d86e1a..253f0c2d 100644
|
||||
* @return A new location where X/Y/Z are on the Block location (integer value of X/Y/Z)
|
||||
*/
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
@ -1,4 +1,4 @@
|
||||
From ddd572cdcea3624d4d5fc369a29deab27c6511b1 Mon Sep 17 00:00:00 2001
|
||||
From d36883d1be821d8adbcf8b65c1537c589b74a46d Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Thu, 3 Mar 2016 04:00:11 -0600
|
||||
Subject: [PATCH] Timings v2
|
||||
@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
|
||||
|
||||
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
|
||||
new file mode 100644
|
||||
index 0000000000..4f624e39c7
|
||||
index 000000000..4f624e39c
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
|
||||
@@ -0,0 +1,125 @@
|
||||
@ -137,7 +137,7 @@ index 0000000000..4f624e39c7
|
||||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimedChunkGenerator.java b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
|
||||
new file mode 100644
|
||||
index 0000000000..0bb63600f3
|
||||
index 000000000..0bb63600f
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
|
||||
@@ -0,0 +1,180 @@
|
||||
@ -323,7 +323,7 @@ index 0000000000..0bb63600f3
|
||||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
|
||||
new file mode 100644
|
||||
index 0000000000..145cb274b0
|
||||
index 000000000..145cb274b
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
|
||||
@@ -0,0 +1,104 @@
|
||||
@ -432,7 +432,7 @@ index 0000000000..145cb274b0
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
index b89ec42525..e4ed7d674e 100644
|
||||
index b89ec4252..e4ed7d674 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
@@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
|
||||
@ -476,7 +476,7 @@ index b89ec42525..e4ed7d674e 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
|
||||
index 06f10e1e84..43feccef8f 100644
|
||||
index 06f10e1e8..43feccef8 100644
|
||||
--- a/src/main/java/net/minecraft/server/Block.java
|
||||
+++ b/src/main/java/net/minecraft/server/Block.java
|
||||
@@ -28,8 +28,16 @@ public class Block implements IMaterial {
|
||||
@ -499,7 +499,7 @@ index 06f10e1e84..43feccef8f 100644
|
||||
Object2ByteLinkedOpenHashMap object2bytelinkedopenhashmap = new Object2ByteLinkedOpenHashMap(200) {
|
||||
protected void rehash(int i) {}
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
|
||||
index 5164e5c928..0c2386f5ec 100644
|
||||
index 5164e5c92..0c2386f5e 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkMap.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkMap.java
|
||||
@@ -14,6 +14,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
|
||||
@ -530,7 +530,7 @@ index 5164e5c928..0c2386f5ec 100644
|
||||
|
||||
return chunk1;
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
index 00cd8d8cea..aabdc9e2f0 100644
|
||||
index 00cd8d8ce..aabdc9e2f 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
@@ -122,14 +122,13 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
@ -560,7 +560,7 @@ index 00cd8d8cea..aabdc9e2f0 100644
|
||||
this.chunkLoader.saveChunk(this.world, ichunkaccess, unloaded); // Spigot
|
||||
} catch (IOException ioexception) {
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
index 88301ee61e..5001fd11dc 100644
|
||||
index 88301ee61..5001fd11d 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -607,7 +607,7 @@ index 88301ee61e..5001fd11dc 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
index 3706e44a34..bf1fffcfee 100644
|
||||
index 3706e44a3..bf1fffcfe 100644
|
||||
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.Level;
|
||||
@ -660,7 +660,7 @@ index 3706e44a34..bf1fffcfee 100644
|
||||
return waitable.get();
|
||||
} catch (java.util.concurrent.ExecutionException e) {
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 17bcef97e0..5590919dd6 100644
|
||||
index ee71abf4e..76080358b 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -29,7 +29,8 @@ import org.bukkit.command.CommandSender;
|
||||
@ -699,7 +699,7 @@ index 17bcef97e0..5590919dd6 100644
|
||||
|
||||
protected float ab() {
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index 514c951516..d6e9915c1f 100644
|
||||
index 514c95151..d6e9915c1 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -32,7 +32,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
|
||||
@ -775,7 +775,7 @@ index 514c951516..d6e9915c1f 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
|
||||
index ae31935c48..70c9b1f50c 100644
|
||||
index ae31935c4..70c9b1f50 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityTracker.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityTracker.java
|
||||
@@ -168,7 +168,7 @@ public class EntityTracker {
|
||||
@ -806,7 +806,7 @@ index ae31935c48..70c9b1f50c 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index d453d0c421..83a73b86ea 100644
|
||||
index d453d0c42..83a73b86e 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -960,7 +960,7 @@ index d453d0c421..83a73b86ea 100644
|
||||
this.methodProfiler.e();
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
index ac6d8cc6e6..d975c2ccf1 100644
|
||||
index ac6d8cc6e..d975c2ccf 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -1054,7 +1054,7 @@ index ac6d8cc6e6..d975c2ccf1 100644
|
||||
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 42e0630e60..5d42cfe81c 100644
|
||||
index 42e0630e6..5d42cfe81 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -57,6 +57,7 @@ import org.bukkit.inventory.CraftingInventory;
|
||||
@ -1093,7 +1093,7 @@ index 42e0630e60..5d42cfe81c 100644
|
||||
// this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
|
||||
// CraftBukkit end
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
|
||||
index 889b32287e..69da194f52 100644
|
||||
index 889b32287..69da194f5 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
|
||||
@@ -1,11 +1,17 @@
|
||||
@ -1116,7 +1116,7 @@ index 889b32287e..69da194f52 100644
|
||||
throw CancelledPacketHandleException.INSTANCE;
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
index e476d3433b..9cef6b9af6 100644
|
||||
index e476d3433..9cef6b9af 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -1140,7 +1140,7 @@ index e476d3433b..9cef6b9af6 100644
|
||||
|
||||
public WhiteList getWhitelist() {
|
||||
diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java
|
||||
index a07895935e..ee5c2421bb 100644
|
||||
index a07895935..ee5c2421b 100644
|
||||
--- a/src/main/java/net/minecraft/server/TickListServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/TickListServer.java
|
||||
@@ -24,13 +24,19 @@ public class TickListServer<T> implements TickList<T> {
|
||||
@ -1194,7 +1194,7 @@ index a07895935e..ee5c2421bb 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
|
||||
index 9361667c3b..0d54513a44 100644
|
||||
index 9361667c3..0d54513a4 100644
|
||||
--- a/src/main/java/net/minecraft/server/TileEntity.java
|
||||
+++ b/src/main/java/net/minecraft/server/TileEntity.java
|
||||
@@ -4,12 +4,13 @@ import javax.annotation.Nullable;
|
||||
@ -1214,7 +1214,7 @@ index 9361667c3b..0d54513a44 100644
|
||||
private final TileEntityTypes<?> e; public TileEntityTypes getTileEntityType() { return e; } // Paper - OBFHELPER
|
||||
protected World world;
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index b2bb06c796..562a85b726 100644
|
||||
index b2bb06c79..562a85b72 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -1329,7 +1329,7 @@ index b2bb06c796..562a85b726 100644
|
||||
|
||||
public boolean a(@Nullable Entity entity, VoxelShape voxelshape) {
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index 2c6f6de4ce..f032ecab64 100644
|
||||
index 2c6f6de4c..f032ecab6 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -1445,10 +1445,10 @@ index 2c6f6de4ce..f032ecab64 100644
|
||||
|
||||
// CraftBukkit start
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index feab96c84c..737ad3e1c0 100644
|
||||
index feab96c84..737ad3e1c 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1837,12 +1837,31 @@ public final class CraftServer implements Server {
|
||||
@@ -1837,6 +1837,7 @@ public final class CraftServer implements Server {
|
||||
private final Spigot spigot = new Spigot()
|
||||
{
|
||||
|
||||
@ -1456,10 +1456,10 @@ index feab96c84c..737ad3e1c0 100644
|
||||
@Override
|
||||
public YamlConfiguration getConfig()
|
||||
{
|
||||
return org.spigotmc.SpigotConfig.config;
|
||||
@@ -1844,6 +1845,24 @@ public final class CraftServer implements Server {
|
||||
}
|
||||
|
||||
+ @Override
|
||||
@Override
|
||||
+ public YamlConfiguration getBukkitConfig()
|
||||
+ {
|
||||
+ return configuration;
|
||||
@ -1477,12 +1477,13 @@ index feab96c84c..737ad3e1c0 100644
|
||||
+ return com.destroystokyo.paper.PaperConfig.config;
|
||||
+ }
|
||||
+
|
||||
@Override
|
||||
+ @Override
|
||||
public void restart() {
|
||||
org.spigotmc.RestartCommand.restart();
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
|
||||
deleted file mode 100644
|
||||
index 4c8ab2bc97..0000000000
|
||||
index 4c8ab2bc9..000000000
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
|
||||
+++ /dev/null
|
||||
@@ -1,174 +0,0 @@
|
||||
@ -1661,7 +1662,7 @@ index 4c8ab2bc97..0000000000
|
||||
- }
|
||||
-}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
|
||||
index 413dd35f06..52a8c48fa4 100644
|
||||
index 413dd35f0..52a8c48fa 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
|
||||
@@ -1,6 +1,8 @@
|
||||
@ -1697,7 +1698,7 @@ index 413dd35f06..52a8c48fa4 100644
|
||||
|
||||
public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 75d56ee3bd..47f650e426 100644
|
||||
index 75d56ee3b..47f650e42 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1665,6 +1665,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@ -1714,7 +1715,7 @@ index 75d56ee3bd..47f650e426 100644
|
||||
|
||||
public Player.Spigot spigot()
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
||||
index f11bd7545f..93b9134d6e 100644
|
||||
index f11bd7545..93b9134d6 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
||||
@@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger;
|
||||
@ -1790,7 +1791,7 @@ index f11bd7545f..93b9134d6e 100644
|
||||
|
||||
private boolean isReady(final int currentTick) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
|
||||
index 7e7ce9a81b..46029ce246 100644
|
||||
index 7e7ce9a81..46029ce24 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
|
||||
@@ -1,8 +1,8 @@
|
||||
@ -1872,7 +1873,7 @@ index 7e7ce9a81b..46029ce246 100644
|
||||
- // Spigot end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
|
||||
index e52ef47b78..3d90b34268 100644
|
||||
index e52ef47b7..3d90b3426 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
|
||||
@@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon;
|
||||
@ -1884,7 +1885,7 @@ index e52ef47b78..3d90b34268 100644
|
||||
this.value = value;
|
||||
}
|
||||
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
|
||||
index e60fe5a920..f68e42c4d4 100644
|
||||
index e60fe5a92..f68e42c4d 100644
|
||||
--- a/src/main/java/org/spigotmc/ActivationRange.java
|
||||
+++ b/src/main/java/org/spigotmc/ActivationRange.java
|
||||
@@ -30,7 +30,7 @@ import net.minecraft.server.EntityWither;
|
||||
@ -1945,5 +1946,5 @@ index e60fe5a920..f68e42c4d4 100644
|
||||
}
|
||||
}
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
||||
|
@ -1,11 +1,11 @@
|
||||
From f5962e81f2d63910e83d54400b0173879b453d57 Mon Sep 17 00:00:00 2001
|
||||
From 11b6ff1e304a5bdfdeff1f418dbf0b31325788c0 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 27 Dec 2016 15:02:42 -0500
|
||||
Subject: [PATCH] String based Action Bar API
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
|
||||
index 70cdc3f102..381542e0d2 100644
|
||||
index 70cdc3f10..381542e0d 100644
|
||||
--- a/src/main/java/net/minecraft/server/MCUtil.java
|
||||
+++ b/src/main/java/net/minecraft/server/MCUtil.java
|
||||
@@ -1,10 +1,13 @@
|
||||
@ -62,14 +62,13 @@ index 70cdc3f102..381542e0d2 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index dea59d3fab..a546f3118e 100644
|
||||
index dea59d3fa..a546f3118 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -208,6 +208,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
}
|
||||
@@ -209,6 +209,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
|
||||
// Paper start
|
||||
+ @Override
|
||||
@Override
|
||||
+ public void sendActionBar(String message) {
|
||||
+ if (getHandle().playerConnection == null || message == null || message.isEmpty()) return;
|
||||
+ getHandle().playerConnection.sendPacket(new PacketPlayOutChat(new net.minecraft.server.ChatComponentText(message), net.minecraft.server.ChatMessageType.GAME_INFO));
|
||||
@ -81,9 +80,10 @@ index dea59d3fab..a546f3118e 100644
|
||||
+ sendActionBar(org.bukkit.ChatColor.translateAlternateColorCodes(alternateChar, message));
|
||||
+ }
|
||||
+
|
||||
@Override
|
||||
+ @Override
|
||||
public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
|
||||
PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
|
||||
packet.header = header;
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From c1dafcce6dd2f9cd431fd85a44036602e7013fbf Mon Sep 17 00:00:00 2001
|
||||
From 1a17038daeb4b0e53963a1cf67756460972dbd08 Mon Sep 17 00:00:00 2001
|
||||
From: Minecrell <minecrell@minecrell.net>
|
||||
Date: Fri, 9 Jun 2017 19:03:43 +0200
|
||||
Subject: [PATCH] Use TerminalConsoleAppender for console improvements
|
||||
@ -19,22 +19,22 @@ Other changes:
|
||||
configuration
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 09b4ddf199..47e307a246 100644
|
||||
index 09b4ddf19..47e307a24 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -39,12 +39,6 @@
|
||||
<version>${minecraft.version}-SNAPSHOT</version>
|
||||
@@ -40,12 +40,6 @@
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
- <dependency>
|
||||
<dependency>
|
||||
- <groupId>jline</groupId>
|
||||
- <artifactId>jline</artifactId>
|
||||
- <version>2.12.1</version>
|
||||
- <scope>compile</scope>
|
||||
- </dependency>
|
||||
<dependency>
|
||||
- <dependency>
|
||||
<groupId>org.ow2.asm</groupId>
|
||||
<artifactId>asm</artifactId>
|
||||
<version>6.2</version>
|
||||
@@ -69,6 +63,32 @@
|
||||
<version>3.0.3</version>
|
||||
<scope>compile</scope>
|
||||
@ -89,7 +89,7 @@ index 09b4ddf199..47e307a246 100644
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
|
||||
new file mode 100644
|
||||
index 0000000000..688b4715eb
|
||||
index 000000000..688b4715e
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
|
||||
@@ -0,0 +1,40 @@
|
||||
@ -135,7 +135,7 @@ index 0000000000..688b4715eb
|
||||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
|
||||
new file mode 100644
|
||||
index 0000000000..685deaa0e5
|
||||
index 000000000..685deaa0e
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
|
||||
@@ -0,0 +1,17 @@
|
||||
@ -157,7 +157,7 @@ index 0000000000..685deaa0e5
|
||||
+
|
||||
+}
|
||||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
index bf1fffcfee..af430b73f0 100644
|
||||
index bf1fffcfe..af430b73f 100644
|
||||
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
@@ -79,6 +79,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||
@ -199,7 +199,7 @@ index bf1fffcfee..af430b73f0 100644
|
||||
System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
|
||||
System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index db09d391ea..41ee97b1a4 100644
|
||||
index 7a7893c4d..f88ba7db7 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -57,7 +57,6 @@ import org.apache.commons.lang3.Validate;
|
||||
@ -257,7 +257,7 @@ index db09d391ea..41ee97b1a4 100644
|
||||
|
||||
public KeyPair G() {
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
index 0b0d996523..4cbe148010 100644
|
||||
index 0b0d99652..4cbe14801 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -78,8 +78,7 @@ public abstract class PlayerList {
|
||||
@ -271,7 +271,7 @@ index 0b0d996523..4cbe148010 100644
|
||||
|
||||
this.k = new GameProfileBanList(PlayerList.a);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 8412e71d71..47b4c01067 100644
|
||||
index 8412e71d7..47b4c0106 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -137,8 +137,8 @@ import java.nio.ByteBuffer;
|
||||
@ -299,7 +299,7 @@ index 8412e71d71..47b4c01067 100644
|
||||
@Override
|
||||
public PluginCommand getPluginCommand(String name) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
index c552c624e5..3245fded9b 100644
|
||||
index c552c624e..3245fded9 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
@@ -14,7 +14,7 @@ import java.util.logging.Logger;
|
||||
@ -341,7 +341,7 @@ index c552c624e5..3245fded9b 100644
|
||||
if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
|
||||
deleted file mode 100644
|
||||
index 26a2fb8942..0000000000
|
||||
index 26a2fb894..000000000
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
|
||||
+++ /dev/null
|
||||
@@ -1,74 +0,0 @@
|
||||
@ -420,7 +420,7 @@ index 26a2fb8942..0000000000
|
||||
- }
|
||||
-}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
|
||||
index 33e8ea02c4..1e3aae3b8f 100644
|
||||
index 33e8ea02c..1e3aae3b8 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
|
||||
@@ -8,17 +8,27 @@ import java.util.logging.Level;
|
||||
@ -499,7 +499,7 @@ index 33e8ea02c4..1e3aae3b8f 100644
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
|
||||
index 984df4083d..bbb5a84f36 100644
|
||||
index 984df4083..bbb5a84f3 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
|
||||
@@ -20,7 +20,7 @@ public class ServerShutdownThread extends Thread {
|
||||
@ -513,7 +513,7 @@ index 984df4083d..bbb5a84f36 100644
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
|
||||
deleted file mode 100644
|
||||
index b640971130..0000000000
|
||||
index b64097113..000000000
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
|
||||
+++ /dev/null
|
||||
@@ -1,54 +0,0 @@
|
||||
@ -572,7 +572,7 @@ index b640971130..0000000000
|
||||
- }
|
||||
-}
|
||||
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
|
||||
index 5cee8f00ef..08b6bb7f97 100644
|
||||
index 5cee8f00e..08b6bb7f9 100644
|
||||
--- a/src/main/resources/log4j2.xml
|
||||
+++ b/src/main/resources/log4j2.xml
|
||||
@@ -1,12 +1,11 @@
|
||||
@ -602,5 +602,5 @@ index 5cee8f00ef..08b6bb7f97 100644
|
||||
<AppenderRef ref="TerminalConsole" level="info"/>
|
||||
</Root>
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
||||
|
@ -1,26 +1,26 @@
|
||||
From a56190cc108317d133af9fa00a0e7ed0ad0ae60e Mon Sep 17 00:00:00 2001
|
||||
From 1fcaa1fd261e1fe2ab67c0d49036fd6a39234e40 Mon Sep 17 00:00:00 2001
|
||||
From: Minecrell <minecrell@minecrell.net>
|
||||
Date: Thu, 21 Sep 2017 16:33:35 +0200
|
||||
Subject: [PATCH] Include Log4J2 SLF4J implementation
|
||||
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index bb32cb749d..a319cfe3b8 100644
|
||||
index bb32cb749..a319cfe3b 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -90,6 +90,12 @@
|
||||
</dependency>
|
||||
|
||||
@@ -92,6 +92,12 @@
|
||||
<!-- Paper - Add additional Log4J dependencies -->
|
||||
+ <dependency>
|
||||
+ <groupId>org.apache.logging.log4j</groupId>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
+ <artifactId>log4j-slf4j-impl</artifactId>
|
||||
+ <version>2.8.1</version>
|
||||
+ <scope>runtime</scope>
|
||||
+ </dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
+ <dependency>
|
||||
+ <groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-iostreams</artifactId>
|
||||
<version>2.8.1</version>
|
||||
</dependency>
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
||||
|
@ -1,16 +1,16 @@
|
||||
From eeae913b5048f0d0694f3c0f5877f08461bc4e09 Mon Sep 17 00:00:00 2001
|
||||
From 8f063043f8d5b2487af59d9315b1f1de72bab3bc Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Fri, 20 Jul 2018 23:37:03 -0500
|
||||
Subject: [PATCH] AnvilDamageEvent
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
|
||||
index c252ff6d5..1f0a46aaf 100644
|
||||
index fb3413d81..9f20348d0 100644
|
||||
--- a/src/main/java/net/minecraft/server/ContainerAnvil.java
|
||||
+++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
|
||||
@@ -73,6 +73,16 @@ public class ContainerAnvil extends Container {
|
||||
if (!world.isClientSide) {
|
||||
if (!entityhuman.abilities.canInstantlyBuild && iblockdata.a(TagsBlock.x) && entityhuman.getRandom().nextFloat() < 0.12F) {
|
||||
if (!entityhuman.abilities.canInstantlyBuild && iblockdata.a(TagsBlock.y) && entityhuman.getRandom().nextFloat() < 0.12F) {
|
||||
IBlockData iblockdata1 = BlockAnvil.a_(iblockdata);
|
||||
+ // Paper start
|
||||
+ com.destroystokyo.paper.event.block.AnvilDamagedEvent event = new com.destroystokyo.paper.event.block.AnvilDamagedEvent(getBukkitView(), org.bukkit.craftbukkit.block.data.CraftBlockData.fromData(iblockdata1));
|
@ -1,4 +1,4 @@
|
||||
From a10cdd4797b779ff0853512f98b6e89cc1b1385d Mon Sep 17 00:00:00 2001
|
||||
From 0f558abe6488ef5bfd941799d72f406b2f3504a8 Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sat, 21 Jul 2018 01:51:27 -0500
|
||||
Subject: [PATCH] EnderDragon Events
|
||||
@ -27,7 +27,7 @@ index b78d3fe50..ef8b0e765 100644
|
||||
if (this.d != null) {
|
||||
this.d.die();
|
||||
diff --git a/src/main/java/net/minecraft/server/DragonControllerStrafe.java b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
|
||||
index 9c158fd58..b4887d658 100644
|
||||
index f741ada67..a9954c12e 100644
|
||||
--- a/src/main/java/net/minecraft/server/DragonControllerStrafe.java
|
||||
+++ b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
|
||||
@@ -67,7 +67,9 @@ public class DragonControllerStrafe extends AbstractDragonController {
|
@ -1,4 +1,4 @@
|
||||
From 6bfd7bc02e47e3745fdbe5bd300fff5b02a63082 Mon Sep 17 00:00:00 2001
|
||||
From f9e17761040d43d59a66a278d26ea5235ca13653 Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sat, 21 Jul 2018 01:59:59 -0500
|
||||
Subject: [PATCH] PlayerElytraBoostEvent
|
||||
@ -28,5 +28,5 @@ index d4420e68f..82da8dd38 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 3b96328cbca2cc941e8a10dfdc47f5970379ef8e Mon Sep 17 00:00:00 2001
|
||||
From 4c720e8654823b9c94495a438cb907f513088a74 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sat, 21 Jul 2018 14:27:34 -0400
|
||||
Subject: [PATCH] Duplicate UUID Resolve Option
|
||||
@ -33,7 +33,7 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
|
||||
It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 7bd7aa0d94..5d9bed3f19 100644
|
||||
index 7bd7aa0d9..5d9bed3f1 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -430,4 +430,40 @@ public class PaperWorldConfig {
|
||||
@ -78,7 +78,7 @@ index 7bd7aa0d94..5d9bed3f19 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||||
index 3ac115ff65..ba2aeb432d 100644
|
||||
index 3ac115ff6..ba2aeb432 100644
|
||||
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||||
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||||
@@ -1,5 +1,10 @@
|
||||
@ -149,7 +149,7 @@ index 3ac115ff65..ba2aeb432d 100644
|
||||
this.world.a((Collection) entityslice);
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 4ea52f9c59..2217ca9737 100644
|
||||
index 4ea52f9c5..2217ca973 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -2735,6 +2735,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
@ -161,7 +161,7 @@ index 4ea52f9c59..2217ca9737 100644
|
||||
this.uniqueID = uuid;
|
||||
this.au = this.uniqueID.toString();
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index 127dcedc97..5ee7cdc79c 100644
|
||||
index 127dcedc9..5ee7cdc79 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -72,7 +72,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
|
||||
@ -174,7 +174,7 @@ index 127dcedc97..5ee7cdc79c 100644
|
||||
public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
|
||||
private final List<TileEntity> c = Lists.newArrayList();
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index 747d99dbe6..7a9f28421b 100644
|
||||
index 747d99dbe..7a9f28421 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -40,7 +40,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
||||
@ -220,5 +220,5 @@ index 747d99dbe6..7a9f28421b 100644
|
||||
logger.error("Overwrote an existing entity " + old + " with " + entity);
|
||||
if (DEBUG_ENTITIES) {
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
@ -1,11 +1,11 @@
|
||||
From a753c54e8811761c74b60be329b82c2fed32c769 Mon Sep 17 00:00:00 2001
|
||||
From 5e69a5dcdd8e705e780d929bf3f7be46187be03c Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sat, 21 Jul 2018 16:55:04 -0400
|
||||
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
|
||||
index 0f4a894ebb..995e02f1d2 100644
|
||||
index 54a605f9b..f4dc7e4ac 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -156,6 +156,27 @@ public class CraftWorld implements World {
|
||||
@ -37,5 +37,5 @@ index 0f4a894ebb..995e02f1d2 100644
|
||||
return this.world.getChunkProviderServer().getChunkAt(x, z).bukkitChunk;
|
||||
}
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 1be6de780667fdfdb842f80bfa0730a70371895d Mon Sep 17 00:00:00 2001
|
||||
From b10770db64e394791dd56db6eb77c06337c3033e Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sat, 21 Apr 2018 11:21:48 -0400
|
||||
Subject: [PATCH] Configurable Allowance of Permanent Chunk Loaders
|
||||
@ -7,7 +7,7 @@ This disables the behavior that allows players to keep chunks permanently loaded
|
||||
by default and allows server operators to enable it if they wish.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index ba6d5b7ff5..b9f5f49055 100644
|
||||
index 5d9bed3f1..9d3e6cc46 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -466,4 +466,9 @@ public class PaperWorldConfig {
|
||||
@ -21,7 +21,7 @@ index ba6d5b7ff5..b9f5f49055 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
index 7d77c5fb31..fd8430a68f 100644
|
||||
index 497372124..0e0c7b1ab 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
@@ -111,7 +111,7 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
@ -34,5 +34,5 @@ index 7d77c5fb31..fd8430a68f 100644
|
||||
return chunk != null ? chunk : this.loadChunkAt(i, j);
|
||||
}
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 6fe1ca8e8466247070481df3b515bba54cec603f Mon Sep 17 00:00:00 2001
|
||||
From caa776ae94358eac74eb0678f01c4a9d8141aa4a Mon Sep 17 00:00:00 2001
|
||||
From: Techcable <Techcable@outlook.com>
|
||||
Date: Wed, 30 Nov 2016 20:56:58 -0600
|
||||
Subject: [PATCH] Speedup BlockPos by fixing inlining
|
||||
@ -202,5 +202,5 @@ index 252e00e16..f769b178c 100644
|
||||
|
||||
public BlockPosition h() {
|
||||
--
|
||||
2.16.1.windows.1
|
||||
2.11.0
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 29f7275b4762c83996dee6cd72fa71af7adc0f81 Mon Sep 17 00:00:00 2001
|
||||
From fb9e65665b8576154cf6dc47fee9d3e858613596 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sun, 22 Jul 2018 21:21:41 -0400
|
||||
Subject: [PATCH] Don't save Proto Chunks
|
||||
@ -8,7 +8,7 @@ the loadChunk method refuses to acknoledge they exists, and will restart
|
||||
a new chunk generation process to begin with, so saving them serves no benefit.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
index 5fd0c0cf50..43348a627f 100644
|
||||
index ea8684747..a97e024ec 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
@@ -282,6 +282,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
|
||||
@ -20,7 +20,7 @@ index 5fd0c0cf50..43348a627f 100644
|
||||
world.checkSession();
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
|
||||
index 501565dd5d..7b30687530 100644
|
||||
index 5d9118daa..7629e0d05 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
|
||||
@@ -23,7 +23,7 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus
|
||||
@ -33,5 +33,5 @@ index 501565dd5d..7b30687530 100644
|
||||
});
|
||||
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 6e996abb708a54a6171ee963ec1569ceb5c0d2cf Mon Sep 17 00:00:00 2001
|
||||
From 4ac056028269b73543a2088967b0ec92c283d2a3 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Steinborn <git@steinborn.me>
|
||||
Date: Mon, 23 Jul 2018 13:08:19 -0400
|
||||
Subject: [PATCH] Optimize RegistryID.c()
|
||||
@ -6,7 +6,7 @@ Subject: [PATCH] Optimize RegistryID.c()
|
||||
This is a frequent hotspot for world loading/saving.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java
|
||||
index bde5714dd6..a01cda9d81 100644
|
||||
index bde5714dd..a01cda9d8 100644
|
||||
--- a/src/main/java/net/minecraft/server/RegistryID.java
|
||||
+++ b/src/main/java/net/minecraft/server/RegistryID.java
|
||||
@@ -14,12 +14,14 @@ public class RegistryID<K> implements Registry { // Paper - decompile fix
|
||||
@ -64,5 +64,5 @@ index bde5714dd6..a01cda9d81 100644
|
||||
|
||||
public int b() {
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
@ -1,11 +1,11 @@
|
||||
From 51044d9a361f21f02b6c9fadb0a9d9d5e37d636c Mon Sep 17 00:00:00 2001
|
||||
From 4890b7fead4b7ae8196aa3e9a1fbc30398c402f3 Mon Sep 17 00:00:00 2001
|
||||
From: Hugo Manrique <hugmanrique@gmail.com>
|
||||
Date: Mon, 23 Jul 2018 12:57:39 +0200
|
||||
Subject: [PATCH] Option to prevent armor stands from doing entity lookups
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index b9f5f49055..aa95372e69 100644
|
||||
index 9d3e6cc46..5fb330096 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -350,6 +350,11 @@ public class PaperWorldConfig {
|
||||
@ -21,7 +21,7 @@ index b9f5f49055..aa95372e69 100644
|
||||
private void maxEntityCollision() {
|
||||
maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index 127dcedc97..72e22c09ba 100644
|
||||
index 5ee7cdc79..bf51913fc 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -11,6 +11,7 @@ import java.util.Iterator;
|
||||
@ -48,5 +48,5 @@ index 127dcedc97..72e22c09ba 100644
|
||||
int i = MathHelper.floor(axisalignedbb.a);
|
||||
int j = MathHelper.f(axisalignedbb.d);
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
@ -1,11 +1,11 @@
|
||||
From 56fc9a41a74bf432c9c846abb6fd7568eb3d4e8e Mon Sep 17 00:00:00 2001
|
||||
From 905b30940a418c6658214a6e4898d50a745de464 Mon Sep 17 00:00:00 2001
|
||||
From: Hugo Manrique <hugmanrique@gmail.com>
|
||||
Date: Mon, 23 Jul 2018 14:22:26 +0200
|
||||
Subject: [PATCH] Vanished players don't have rights
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 9f2a23d693..e657778469 100644
|
||||
index 2217ca973..184d46191 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -92,7 +92,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
@ -18,7 +18,7 @@ index 9f2a23d693..e657778469 100644
|
||||
protected int k;
|
||||
private Entity ax;
|
||||
diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
|
||||
index c8f305e6d6..b57f6efb3a 100644
|
||||
index c8f305e6d..b57f6efb3 100644
|
||||
--- a/src/main/java/net/minecraft/server/IBlockData.java
|
||||
+++ b/src/main/java/net/minecraft/server/IBlockData.java
|
||||
@@ -179,6 +179,7 @@ public interface IBlockData extends IBlockDataHolder<IBlockData> {
|
||||
@ -30,7 +30,7 @@ index c8f305e6d6..b57f6efb3a 100644
|
||||
return this.getBlock().f(this, iblockaccess, blockposition);
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
|
||||
index 1cecccef23..afc881d9af 100644
|
||||
index 1cecccef2..afc881d9a 100644
|
||||
--- a/src/main/java/net/minecraft/server/ItemBlock.java
|
||||
+++ b/src/main/java/net/minecraft/server/ItemBlock.java
|
||||
@@ -70,7 +70,8 @@ public class ItemBlock extends Item {
|
||||
@ -44,7 +44,7 @@ index 1cecccef23..afc881d9af 100644
|
||||
BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), CraftBlockData.fromData(iblockdata), defaultReturn);
|
||||
blockactioncontext.getWorld().getServer().getPluginManager().callEvent(event);
|
||||
diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java
|
||||
index 53c9f21887..71e4084320 100644
|
||||
index 53c9f2188..71e408432 100644
|
||||
--- a/src/main/java/net/minecraft/server/VoxelShape.java
|
||||
+++ b/src/main/java/net/minecraft/server/VoxelShape.java
|
||||
@@ -22,6 +22,7 @@ public abstract class VoxelShape {
|
||||
@ -64,7 +64,7 @@ index 53c9f21887..71e4084320 100644
|
||||
return this.a.a();
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index 72e22c09ba..6d80e55c19 100644
|
||||
index bf51913fc..a66770e24 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -1545,6 +1545,37 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
|
||||
@ -106,7 +106,7 @@ index 72e22c09ba..6d80e55c19 100644
|
||||
if (voxelshape.b()) {
|
||||
return true;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
index cf398cd250..140ddae0d7 100644
|
||||
index cf398cd25..140ddae0d 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
@@ -804,6 +804,14 @@ public class CraftEventFactory {
|
||||
@ -125,5 +125,5 @@ index cf398cd250..140ddae0d7 100644
|
||||
return event;
|
||||
}
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
@ -1,11 +1,11 @@
|
||||
From e03f8b9d7954cb8b1b292d87e3945393e19fb521 Mon Sep 17 00:00:00 2001
|
||||
From af643d7e2501d6ca5847d93246a0c3e1549171bd Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 23 Jul 2018 19:13:06 -0400
|
||||
Subject: [PATCH] Thread Safe Iteration of Chunk Scheduler
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
|
||||
index 7629e0d054..5ee8bedf34 100644
|
||||
index 7629e0d05..5ee8bedf3 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
|
||||
@@ -1,8 +1,10 @@
|
||||
@ -43,5 +43,5 @@ index 7629e0d054..5ee8bedf34 100644
|
||||
ChunkTaskScheduler.b.error("Couldn\'t save chunk", ioexception);
|
||||
} catch (ExceptionWorldConflict exceptionworldconflict) {
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
@ -1,4 +1,4 @@
|
||||
From f6cfd4813697adbaeacbaa38f4181fc8b055a6fa Mon Sep 17 00:00:00 2001
|
||||
From b3fce2cf53b1d4b52d1b784f32dd41e611b616aa Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 23 Jul 2018 22:18:31 -0400
|
||||
Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
|
||||
@ -6,7 +6,7 @@ Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||||
index 95c6812d7d..aa75cc4205 100644
|
||||
index ba2aeb432..7f882bdca 100644
|
||||
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||||
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||||
@@ -714,6 +714,7 @@ public class Chunk implements IChunkAccess {
|
||||
@ -26,5 +26,5 @@ index 95c6812d7d..aa75cc4205 100644
|
||||
itemCounts[i]--;
|
||||
} else if (entity instanceof IInventory) {
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 56148e925de0b60c171955575e92691cf2fb5457 Mon Sep 17 00:00:00 2001
|
||||
From 2ba18185e726e3875e34a6af9bc4abace2f3cf9d Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 23 Jul 2018 22:44:23 -0400
|
||||
Subject: [PATCH] Add some Debug to Chunk Entity slices
|
||||
@ -9,7 +9,7 @@ This should hopefully avoid duplicate entities ever being created
|
||||
if the entity was to end up in 2 different chunk slices
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||||
index aa75cc4205..56a74c6062 100644
|
||||
index 7f882bdca..4e32ae7db 100644
|
||||
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||||
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||||
@@ -712,8 +712,33 @@ public class Chunk implements IChunkAccess {
|
||||
@ -61,7 +61,7 @@ index aa75cc4205..56a74c6062 100644
|
||||
if (entity instanceof EntityItem) {
|
||||
itemCounts[i]--;
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index e657778469..85358902ff 100644
|
||||
index 184d46191..3a5b3f34a 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -63,6 +63,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
@ -73,5 +73,5 @@ index e657778469..85358902ff 100644
|
||||
static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
|
||||
return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
@ -1,4 +1,4 @@
|
||||
From fb53e1fd3777d4bde51f4ac9a6e8fa0e623cd074 Mon Sep 17 00:00:00 2001
|
||||
From 8f772bcb0fbc96483d0a017c0d89959c72bb64aa Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 23 Jul 2018 23:40:04 -0400
|
||||
Subject: [PATCH] Optimize Region File Cache
|
||||
@ -32,7 +32,7 @@ synchronized context, reducing lock times.
|
||||
Ultimately: This brings us back to Vanilla, which has had no indication of region file loss.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
|
||||
index 3b8d01ea1a..609d6c3550 100644
|
||||
index 3b8d01ea1..609d6c355 100644
|
||||
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
|
||||
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
|
||||
@@ -97,7 +97,7 @@ public class RegionFileCache {
|
||||
@ -63,5 +63,5 @@ index 3b8d01ea1a..609d6c3550 100644
|
||||
|
||||
return regionfile != null ? regionfile.d(i & 31, j & 31) : false;
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 59f7266c560b61d7e1e15e304a92282d3548b1b0 Mon Sep 17 00:00:00 2001
|
||||
From 7df0d9905b02897b6ca0df7aab058d87c47bd488 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 25 Jul 2018 01:21:05 -0400
|
||||
Subject: [PATCH] repair bad rcon.ip settings temporarily
|
||||
@ -8,7 +8,7 @@ accidently missed mapping change, and we defaulted rcon.ip to the server.propert
|
||||
clean up values for people, drop this patch after like 2 weeks.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/RemoteControlListener.java b/src/main/java/net/minecraft/server/RemoteControlListener.java
|
||||
index c237f239f3..1319b3b916 100644
|
||||
index c237f239f..1319b3b91 100644
|
||||
--- a/src/main/java/net/minecraft/server/RemoteControlListener.java
|
||||
+++ b/src/main/java/net/minecraft/server/RemoteControlListener.java
|
||||
@@ -25,6 +25,7 @@ public class RemoteControlListener extends RemoteConnectionThread {
|
||||
@ -20,5 +20,5 @@ index c237f239f3..1319b3b916 100644
|
||||
if (0 == this.h) {
|
||||
this.h = this.i + 10;
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 95116432cfa374f39797e4e998f50223478d15c5 Mon Sep 17 00:00:00 2001
|
||||
From 55838a3d2ed43b3e454a2107f2aa6ff9230a33ff Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Thu, 26 Jul 2018 00:11:12 -0400
|
||||
Subject: [PATCH] Prevent Saving Bad entities to chunks
|
||||
@ -18,7 +18,7 @@ an invalid entity.
|
||||
This should reduce log occurrences of dupe uuid messages.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
index a97e024ec4..bd52bf6561 100644
|
||||
index a97e024ec..bd52bf656 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
@@ -561,11 +561,22 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
|
||||
@ -57,7 +57,7 @@ index a97e024ec4..bd52bf6561 100644
|
||||
nbttagcompound.set("Entities", nbttaglist1);
|
||||
NBTTagList nbttaglist2 = new NBTTagList();
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index a66770e241..1f58042125 100644
|
||||
index a66770e24..1f5804212 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -1053,7 +1053,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
|
||||
@ -70,7 +70,7 @@ index a66770e241..1f58042125 100644
|
||||
return true;
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index 7a9f28421b..b57e1ff364 100644
|
||||
index 7a9f28421..b57e1ff36 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -992,7 +992,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
||||
@ -83,5 +83,5 @@ index 7a9f28421b..b57e1ff364 100644
|
||||
} else {
|
||||
if (!(entity instanceof EntityHuman)) {
|
||||
--
|
||||
2.18.0
|
||||
2.11.0
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren