Resolve memory leak involving TileEntities
Their chunk is set to null before removal, so we kept them around.
Dieser Commit ist enthalten in:
Ursprung
1672ac6fc1
Commit
89a1469d3f
@ -1,4 +1,4 @@
|
|||||||
From 3594eb0377ceba8b900106232665a5a88440a9ca Mon Sep 17 00:00:00 2001
|
From 41222eb065b39b4d29971c7d1b570ebca24305c0 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Wed, 4 Jul 2018 15:22:06 -0400
|
Date: Wed, 4 Jul 2018 15:22:06 -0400
|
||||||
Subject: [PATCH] Configurable Bed Search Radius
|
Subject: [PATCH] Configurable Bed Search Radius
|
||||||
@ -10,7 +10,7 @@ player at their bed should it of became obstructed.
|
|||||||
Defaults to vanilla 1.
|
Defaults to vanilla 1.
|
||||||
|
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
index 3294fbbea..83e54cb90 100644
|
index 3294fbbeaf..83e54cb904 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
@@ -375,4 +375,15 @@ public class PaperWorldConfig {
|
@@ -375,4 +375,15 @@ public class PaperWorldConfig {
|
||||||
@ -30,7 +30,7 @@ index 3294fbbea..83e54cb90 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java
|
diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java
|
||||||
index 3ef19c0c2..07e530666 100644
|
index 3ef19c0c2e..07e530666e 100644
|
||||||
--- a/src/main/java/net/minecraft/server/BlockBed.java
|
--- a/src/main/java/net/minecraft/server/BlockBed.java
|
||||||
+++ b/src/main/java/net/minecraft/server/BlockBed.java
|
+++ b/src/main/java/net/minecraft/server/BlockBed.java
|
||||||
@@ -171,6 +171,58 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
|
@@ -171,6 +171,58 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
|
@ -1,4 +1,4 @@
|
|||||||
From 6632389d447a05bff72b0ec4fa3c3d2c798caa3d Mon Sep 17 00:00:00 2001
|
From 031e2b3a398bd8d0bb64f2b939bf29b870492469 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Wed, 4 Jul 2018 15:30:22 -0400
|
Date: Wed, 4 Jul 2018 15:30:22 -0400
|
||||||
Subject: [PATCH] Vex#getSummoner API
|
Subject: [PATCH] Vex#getSummoner API
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] Vex#getSummoner API
|
|||||||
Get's the NPC that summoned this Vex
|
Get's the NPC that summoned this Vex
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
|
diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
|
||||||
index ecfc057a1..83e022c91 100644
|
index ecfc057a18..83e022c91b 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityVex.java
|
--- a/src/main/java/net/minecraft/server/EntityVex.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityVex.java
|
+++ b/src/main/java/net/minecraft/server/EntityVex.java
|
||||||
@@ -92,6 +92,7 @@ public class EntityVex extends EntityMonster {
|
@@ -92,6 +92,7 @@ public class EntityVex extends EntityMonster {
|
||||||
@ -18,7 +18,7 @@ index ecfc057a1..83e022c91 100644
|
|||||||
return this.c;
|
return this.c;
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
||||||
index 737a37b6f..169c951ec 100644
|
index 737a37b6fe..169c951ec3 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
||||||
@@ -1,8 +1,10 @@
|
@@ -1,8 +1,10 @@
|
@ -1,4 +1,4 @@
|
|||||||
From 18e9e428c7d662cd27c7c7591dc214e6a7e062fb Mon Sep 17 00:00:00 2001
|
From f3e0cb55c655bae2f08eefec86a03c00b2b0a865 Mon Sep 17 00:00:00 2001
|
||||||
From: Minecrell <minecrell@minecrell.net>
|
From: Minecrell <minecrell@minecrell.net>
|
||||||
Date: Fri, 13 Jul 2018 14:54:43 +0200
|
Date: Fri, 13 Jul 2018 14:54:43 +0200
|
||||||
Subject: [PATCH] Refresh player inventory when cancelling
|
Subject: [PATCH] Refresh player inventory when cancelling
|
||||||
@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is
|
|||||||
cancelled to avoid this problem.
|
cancelled to avoid this problem.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
index 0385eced6..4c99a321b 100644
|
index 0385eced64..4c99a321b7 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
@@ -1964,6 +1964,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
@@ -1964,6 +1964,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
@ -1,11 +1,11 @@
|
|||||||
From 35068abb2ee387a5b2084fb360aea4299a461c0e Mon Sep 17 00:00:00 2001
|
From ae6b17a6485b10d0dee2b5e291f8a559abc9123a Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Thu, 19 Jul 2018 01:05:00 -0400
|
Date: Thu, 19 Jul 2018 01:05:00 -0400
|
||||||
Subject: [PATCH] Don't change the Entity Random seed for squids
|
Subject: [PATCH] Don't change the Entity Random seed for squids
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
|
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
|
||||||
index d5dff4b88..77c0ed42f 100644
|
index d5dff4b88c..77c0ed42f4 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntitySquid.java
|
--- a/src/main/java/net/minecraft/server/EntitySquid.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntitySquid.java
|
+++ b/src/main/java/net/minecraft/server/EntitySquid.java
|
||||||
@@ -19,7 +19,7 @@ public class EntitySquid extends EntityWaterAnimal {
|
@@ -19,7 +19,7 @@ public class EntitySquid extends EntityWaterAnimal {
|
@ -1,4 +1,4 @@
|
|||||||
From 00e013d504b64b9a0df93973e81e71e15df41e73 Mon Sep 17 00:00:00 2001
|
From 127bfea5a9352e569678cfff0289d97192b7134d Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Thu, 19 Jul 2018 01:08:05 -0400
|
Date: Thu, 19 Jul 2018 01:08:05 -0400
|
||||||
Subject: [PATCH] Re-add vanilla entity warnings for duplicates
|
Subject: [PATCH] Re-add vanilla entity warnings for duplicates
|
||||||
@ -8,7 +8,7 @@ These are a critical sign that somethin went wrong, and you've lost some data...
|
|||||||
We should kind of know about these things you know.
|
We should kind of know about these things you know.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
index 340460a33..d384d3526 100644
|
index 067379252d..bac458fa54 100644
|
||||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
@@ -966,7 +966,8 @@ public class WorldServer extends World {
|
@@ -966,7 +966,8 @@ public class WorldServer extends World {
|
@ -1,11 +1,11 @@
|
|||||||
From e60fd4f27a55cae981e417d4ccbde0f508450b1b Mon Sep 17 00:00:00 2001
|
From b4e4fa6908e7d18c22bb6975982b0abb7dac2b3e Mon Sep 17 00:00:00 2001
|
||||||
From: Hugo Manrique <hugmanrique@gmail.com>
|
From: Hugo Manrique <hugmanrique@gmail.com>
|
||||||
Date: Mon, 16 Jul 2018 12:42:20 +0200
|
Date: Mon, 16 Jul 2018 12:42:20 +0200
|
||||||
Subject: [PATCH] Avoid item merge if stack size above max stack size
|
Subject: [PATCH] Avoid item merge if stack size above max stack size
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
|
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
|
||||||
index bda5ea463..ddd1f6307 100644
|
index bda5ea4632..ddd1f63073 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
||||||
@@ -168,6 +168,10 @@ public class EntityItem extends Entity {
|
@@ -168,6 +168,10 @@ public class EntityItem extends Entity {
|
@ -1,11 +1,11 @@
|
|||||||
From 5433e0ac79c4fcc7dbdb754079d60da2aa88d0b6 Mon Sep 17 00:00:00 2001
|
From 795db2797f8881fc60d2c1b4056fe909dfe75074 Mon Sep 17 00:00:00 2001
|
||||||
From: Minecrell <minecrell@minecrell.net>
|
From: Minecrell <minecrell@minecrell.net>
|
||||||
Date: Tue, 17 Jul 2018 16:42:17 +0200
|
Date: Tue, 17 Jul 2018 16:42:17 +0200
|
||||||
Subject: [PATCH] Use asynchronous Log4j 2 loggers
|
Subject: [PATCH] Use asynchronous Log4j 2 loggers
|
||||||
|
|
||||||
|
|
||||||
diff --git a/pom.xml b/pom.xml
|
diff --git a/pom.xml b/pom.xml
|
||||||
index 3d2065fd7..e01d95f17 100644
|
index 3d2065fd75..e01d95f17d 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -74,6 +74,13 @@
|
@@ -74,6 +74,13 @@
|
||||||
@ -24,7 +24,7 @@ index 3d2065fd7..e01d95f17 100644
|
|||||||
<artifactId>asm</artifactId>
|
<artifactId>asm</artifactId>
|
||||||
diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties
|
diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..ee7c90784
|
index 0000000000..ee7c90784c
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/src/main/resources/log4j2.component.properties
|
+++ b/src/main/resources/log4j2.component.properties
|
||||||
@@ -0,0 +1 @@
|
@@ -0,0 +1 @@
|
@ -1,4 +1,4 @@
|
|||||||
From bd19e69fc49193f372723ce173ffb18846f950c2 Mon Sep 17 00:00:00 2001
|
From 940fc083c72e8d8dea0d86c313a5a01fe433f7fc Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Thu, 19 Jul 2018 01:13:28 -0400
|
Date: Thu, 19 Jul 2018 01:13:28 -0400
|
||||||
Subject: [PATCH] add more information to Entity.toString()
|
Subject: [PATCH] add more information to Entity.toString()
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
|
|||||||
UUID, ticks lived, valid, dead
|
UUID, ticks lived, valid, dead
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||||
index a428ca262..26003866d 100644
|
index a428ca2624..26003866d2 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||||
@@ -2437,7 +2437,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@@ -2437,7 +2437,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@ -1,4 +1,4 @@
|
|||||||
From f727a659738d4a109e1571b04b2eaf3c30e8a970 Mon Sep 17 00:00:00 2001
|
From 683211e1a74f6011ac424bbed783ed5d09429951 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sat, 21 Jul 2018 08:25:40 -0400
|
Date: Sat, 21 Jul 2018 08:25:40 -0400
|
||||||
Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
|
Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
|
|||||||
Add -Ddebug.entities=true to your JVM flags to gain more information
|
Add -Ddebug.entities=true to your JVM flags to gain more information
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||||
index 26003866d..54d025bf7 100644
|
index 26003866d2..54d025bf7d 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||||
@@ -75,6 +75,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@@ -75,6 +75,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||||
@ -19,7 +19,7 @@ index 26003866d..54d025bf7 100644
|
|||||||
if (bukkitEntity == null) {
|
if (bukkitEntity == null) {
|
||||||
bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
|
bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
|
||||||
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||||
index ae04198c9..c7bc4cc36 100644
|
index ae04198c95..c7bc4cc363 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||||
@@ -874,6 +874,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
|
@@ -874,6 +874,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
|
||||||
@ -40,7 +40,7 @@ index ae04198c9..c7bc4cc36 100644
|
|||||||
|
|
||||||
protected void g() {
|
protected void g() {
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index 0e9530ea5..00b7d90d7 100644
|
index e3de634893..db0c520394 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -68,6 +68,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
@@ -68,6 +68,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
||||||
@ -52,7 +52,7 @@ index 0e9530ea5..00b7d90d7 100644
|
|||||||
public boolean captureBlockStates = false;
|
public boolean captureBlockStates = false;
|
||||||
public boolean captureTreeGeneration = false;
|
public boolean captureTreeGeneration = false;
|
||||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
index d384d3526..6f298d737 100644
|
index bac458fa54..957ca12e4a 100644
|
||||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
@@ -69,6 +69,9 @@ public class WorldServer extends World {
|
@@ -69,6 +69,9 @@ public class WorldServer extends World {
|
@ -1,11 +1,11 @@
|
|||||||
From 382fde1bd1af7b8ce095534b5ac7d585a2b3f1fe Mon Sep 17 00:00:00 2001
|
From 6895d564dbcdf151c559133974d76b1c22552c24 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Sat, 21 Jul 2018 01:51:27 -0500
|
Date: Sat, 21 Jul 2018 01:51:27 -0500
|
||||||
Subject: [PATCH] EnderDragon Events
|
Subject: [PATCH] EnderDragon Events
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
|
diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
|
||||||
index 4ab310cd6..90f6d58dd 100644
|
index 4ab310cd6b..90f6d58ddd 100644
|
||||||
--- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
|
--- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
|
||||||
+++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
|
+++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
|
||||||
@@ -65,7 +65,9 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
|
@@ -65,7 +65,9 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
|
||||||
@ -28,7 +28,7 @@ index 4ab310cd6..90f6d58dd 100644
|
|||||||
public void e() {
|
public void e() {
|
||||||
if (this.d != null) {
|
if (this.d != null) {
|
||||||
diff --git a/src/main/java/net/minecraft/server/DragonControllerStrafe.java b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
|
diff --git a/src/main/java/net/minecraft/server/DragonControllerStrafe.java b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
|
||||||
index b46660576..bf15964e7 100644
|
index b466605762..bf15964e78 100644
|
||||||
--- a/src/main/java/net/minecraft/server/DragonControllerStrafe.java
|
--- a/src/main/java/net/minecraft/server/DragonControllerStrafe.java
|
||||||
+++ b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
|
+++ b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
|
||||||
@@ -68,7 +68,9 @@ public class DragonControllerStrafe extends AbstractDragonController {
|
@@ -68,7 +68,9 @@ public class DragonControllerStrafe extends AbstractDragonController {
|
||||||
@ -42,7 +42,7 @@ index b46660576..bf15964e7 100644
|
|||||||
if (this.d != null) {
|
if (this.d != null) {
|
||||||
while (!this.d.b()) {
|
while (!this.d.b()) {
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityDragonFireball.java b/src/main/java/net/minecraft/server/EntityDragonFireball.java
|
diff --git a/src/main/java/net/minecraft/server/EntityDragonFireball.java b/src/main/java/net/minecraft/server/EntityDragonFireball.java
|
||||||
index 239be99c5..2195b83ce 100644
|
index 239be99c51..2195b83ce2 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityDragonFireball.java
|
--- a/src/main/java/net/minecraft/server/EntityDragonFireball.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java
|
+++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java
|
||||||
@@ -40,8 +40,10 @@ public class EntityDragonFireball extends EntityFireball {
|
@@ -40,8 +40,10 @@ public class EntityDragonFireball extends EntityFireball {
|
@ -1,11 +1,11 @@
|
|||||||
From 6d6fa4bfda778a486c9e10d9395d3e326ec19978 Mon Sep 17 00:00:00 2001
|
From 9383864ec9d2e19b7038d6e6b11b3b711a16e614 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Sat, 21 Jul 2018 01:59:59 -0500
|
Date: Sat, 21 Jul 2018 01:59:59 -0500
|
||||||
Subject: [PATCH] PlayerElytraBoostEvent
|
Subject: [PATCH] PlayerElytraBoostEvent
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
|
diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
|
||||||
index aea46ffae..9e86ef4ce 100644
|
index aea46ffae5..9e86ef4ce2 100644
|
||||||
--- a/src/main/java/net/minecraft/server/ItemFireworks.java
|
--- a/src/main/java/net/minecraft/server/ItemFireworks.java
|
||||||
+++ b/src/main/java/net/minecraft/server/ItemFireworks.java
|
+++ b/src/main/java/net/minecraft/server/ItemFireworks.java
|
||||||
@@ -35,11 +35,16 @@ public class ItemFireworks extends Item {
|
@@ -35,11 +35,16 @@ public class ItemFireworks extends Item {
|
@ -1,11 +1,11 @@
|
|||||||
From 8b926ae73aeaf598f61257a8bd177cbabc3d3f90 Mon Sep 17 00:00:00 2001
|
From 594478a4810ff512d5eb66427cc6648714a770d9 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Sat, 21 Jul 2018 03:11:03 -0500
|
Date: Sat, 21 Jul 2018 03:11:03 -0500
|
||||||
Subject: [PATCH] PlayerLaunchProjectileEvent
|
Subject: [PATCH] PlayerLaunchProjectileEvent
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/ItemEgg.java b/src/main/java/net/minecraft/server/ItemEgg.java
|
diff --git a/src/main/java/net/minecraft/server/ItemEgg.java b/src/main/java/net/minecraft/server/ItemEgg.java
|
||||||
index 2bdb65bf8..f526af45f 100644
|
index 2bdb65bf87..f526af45fb 100644
|
||||||
--- a/src/main/java/net/minecraft/server/ItemEgg.java
|
--- a/src/main/java/net/minecraft/server/ItemEgg.java
|
||||||
+++ b/src/main/java/net/minecraft/server/ItemEgg.java
|
+++ b/src/main/java/net/minecraft/server/ItemEgg.java
|
||||||
@@ -10,17 +10,35 @@ public class ItemEgg extends Item {
|
@@ -10,17 +10,35 @@ public class ItemEgg extends Item {
|
||||||
@ -46,7 +46,7 @@ index 2bdb65bf8..f526af45f 100644
|
|||||||
|
|
||||||
entityhuman.b(StatisticList.ITEM_USED.b(this));
|
entityhuman.b(StatisticList.ITEM_USED.b(this));
|
||||||
diff --git a/src/main/java/net/minecraft/server/ItemEnderPearl.java b/src/main/java/net/minecraft/server/ItemEnderPearl.java
|
diff --git a/src/main/java/net/minecraft/server/ItemEnderPearl.java b/src/main/java/net/minecraft/server/ItemEnderPearl.java
|
||||||
index eb5f62dec..e8e52d726 100644
|
index eb5f62dec2..e8e52d726e 100644
|
||||||
--- a/src/main/java/net/minecraft/server/ItemEnderPearl.java
|
--- a/src/main/java/net/minecraft/server/ItemEnderPearl.java
|
||||||
+++ b/src/main/java/net/minecraft/server/ItemEnderPearl.java
|
+++ b/src/main/java/net/minecraft/server/ItemEnderPearl.java
|
||||||
@@ -16,7 +16,19 @@ public class ItemEnderPearl extends Item {
|
@@ -16,7 +16,19 @@ public class ItemEnderPearl extends Item {
|
||||||
@ -94,7 +94,7 @@ index eb5f62dec..e8e52d726 100644
|
|||||||
entityhuman.b(StatisticList.ITEM_USED.b(this));
|
entityhuman.b(StatisticList.ITEM_USED.b(this));
|
||||||
return new InteractionResultWrapper<>(EnumInteractionResult.SUCCESS, itemstack);
|
return new InteractionResultWrapper<>(EnumInteractionResult.SUCCESS, itemstack);
|
||||||
diff --git a/src/main/java/net/minecraft/server/ItemExpBottle.java b/src/main/java/net/minecraft/server/ItemExpBottle.java
|
diff --git a/src/main/java/net/minecraft/server/ItemExpBottle.java b/src/main/java/net/minecraft/server/ItemExpBottle.java
|
||||||
index 35f842ede..eb626a6f0 100644
|
index 35f842ede5..eb626a6f05 100644
|
||||||
--- a/src/main/java/net/minecraft/server/ItemExpBottle.java
|
--- a/src/main/java/net/minecraft/server/ItemExpBottle.java
|
||||||
+++ b/src/main/java/net/minecraft/server/ItemExpBottle.java
|
+++ b/src/main/java/net/minecraft/server/ItemExpBottle.java
|
||||||
@@ -9,18 +9,35 @@ public class ItemExpBottle extends Item {
|
@@ -9,18 +9,35 @@ public class ItemExpBottle extends Item {
|
||||||
@ -136,7 +136,7 @@ index 35f842ede..eb626a6f0 100644
|
|||||||
|
|
||||||
entityhuman.b(StatisticList.ITEM_USED.b(this));
|
entityhuman.b(StatisticList.ITEM_USED.b(this));
|
||||||
diff --git a/src/main/java/net/minecraft/server/ItemLingeringPotion.java b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
|
diff --git a/src/main/java/net/minecraft/server/ItemLingeringPotion.java b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
|
||||||
index e3683bdae..f3ad1cd6d 100644
|
index e3683bdaef..f3ad1cd6d3 100644
|
||||||
--- a/src/main/java/net/minecraft/server/ItemLingeringPotion.java
|
--- a/src/main/java/net/minecraft/server/ItemLingeringPotion.java
|
||||||
+++ b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
|
+++ b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
|
||||||
@@ -9,15 +9,40 @@ public class ItemLingeringPotion extends ItemPotion {
|
@@ -9,15 +9,40 @@ public class ItemLingeringPotion extends ItemPotion {
|
||||||
@ -182,7 +182,7 @@ index e3683bdae..f3ad1cd6d 100644
|
|||||||
|
|
||||||
entityhuman.b(StatisticList.ITEM_USED.b(this));
|
entityhuman.b(StatisticList.ITEM_USED.b(this));
|
||||||
diff --git a/src/main/java/net/minecraft/server/ItemSnowball.java b/src/main/java/net/minecraft/server/ItemSnowball.java
|
diff --git a/src/main/java/net/minecraft/server/ItemSnowball.java b/src/main/java/net/minecraft/server/ItemSnowball.java
|
||||||
index 624989dd7..c119785b7 100644
|
index 624989dd7b..c119785b78 100644
|
||||||
--- a/src/main/java/net/minecraft/server/ItemSnowball.java
|
--- a/src/main/java/net/minecraft/server/ItemSnowball.java
|
||||||
+++ b/src/main/java/net/minecraft/server/ItemSnowball.java
|
+++ b/src/main/java/net/minecraft/server/ItemSnowball.java
|
||||||
@@ -23,15 +23,23 @@ public class ItemSnowball extends Item {
|
@@ -23,15 +23,23 @@ public class ItemSnowball extends Item {
|
||||||
@ -215,7 +215,7 @@ index 624989dd7..c119785b7 100644
|
|||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/ItemSplashPotion.java b/src/main/java/net/minecraft/server/ItemSplashPotion.java
|
diff --git a/src/main/java/net/minecraft/server/ItemSplashPotion.java b/src/main/java/net/minecraft/server/ItemSplashPotion.java
|
||||||
index e267e43fe..fa6d627db 100644
|
index e267e43fe5..fa6d627db4 100644
|
||||||
--- a/src/main/java/net/minecraft/server/ItemSplashPotion.java
|
--- a/src/main/java/net/minecraft/server/ItemSplashPotion.java
|
||||||
+++ b/src/main/java/net/minecraft/server/ItemSplashPotion.java
|
+++ b/src/main/java/net/minecraft/server/ItemSplashPotion.java
|
||||||
@@ -9,15 +9,39 @@ public class ItemSplashPotion extends ItemPotion {
|
@@ -9,15 +9,39 @@ public class ItemSplashPotion extends ItemPotion {
|
@ -1,4 +1,4 @@
|
|||||||
From 5a73aca979f463c09266b54e433b9b3278e84410 Mon Sep 17 00:00:00 2001
|
From b5a51584adeb6c21dd7e08e08deaf7a1caa6727e Mon Sep 17 00:00:00 2001
|
||||||
From: Techcable <Techcable@outlook.com>
|
From: Techcable <Techcable@outlook.com>
|
||||||
Date: Wed, 30 Nov 2016 20:56:58 -0600
|
Date: Wed, 30 Nov 2016 20:56:58 -0600
|
||||||
Subject: [PATCH] Speedup BlockPos by fixing inlining
|
Subject: [PATCH] Speedup BlockPos by fixing inlining
|
||||||
@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt
|
|||||||
They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
|
They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
|
diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
|
||||||
index 7cb46d7a9..e96428bb2 100644
|
index 7cb46d7a9c..e96428bb2b 100644
|
||||||
--- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
|
--- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
|
||||||
+++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
|
+++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
|
||||||
@@ -7,22 +7,22 @@ import javax.annotation.concurrent.Immutable;
|
@@ -7,22 +7,22 @@ import javax.annotation.concurrent.Immutable;
|
||||||
@ -101,7 +101,7 @@ index 7cb46d7a9..e96428bb2 100644
|
|||||||
return (int) (f + f1 + f2);
|
return (int) (f + f1 + f2);
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
|
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
|
||||||
index 64700b97c..a5e5a4eba 100644
|
index 64700b97c0..a5e5a4ebae 100644
|
||||||
--- a/src/main/java/net/minecraft/server/BlockPosition.java
|
--- a/src/main/java/net/minecraft/server/BlockPosition.java
|
||||||
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
|
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
|
||||||
@@ -335,11 +335,12 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
|
@@ -335,11 +335,12 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
|
@ -1,4 +1,4 @@
|
|||||||
From ed67334df5a2a8de34f26d811784a3e0d5eadb91 Mon Sep 17 00:00:00 2001
|
From e4d1232c82e9f706a4e6f3ca918109cedfeb3121 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sun, 22 Jul 2018 21:21:41 -0400
|
Date: Sun, 22 Jul 2018 21:21:41 -0400
|
||||||
Subject: [PATCH] Don't save Proto Chunks
|
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.
|
a new chunk generation process to begin with, so saving them serves no benefit.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||||
index c7bc4cc36..2244d65ee 100644
|
index c7bc4cc363..2244d65ee6 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||||
@@ -588,6 +588,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
|
@@ -588,6 +588,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
|
@ -1,4 +1,4 @@
|
|||||||
From f13f9afbbbefc4ebfa6874671d36e43c935e3204 Mon Sep 17 00:00:00 2001
|
From 72176dd7071a4145bdb6a9f0eb962a0f96a14e9c Mon Sep 17 00:00:00 2001
|
||||||
From: Andrew Steinborn <git@steinborn.me>
|
From: Andrew Steinborn <git@steinborn.me>
|
||||||
Date: Mon, 23 Jul 2018 13:08:19 -0400
|
Date: Mon, 23 Jul 2018 13:08:19 -0400
|
||||||
Subject: [PATCH] Optimize RegistryID.c()
|
Subject: [PATCH] Optimize RegistryID.c()
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] Optimize RegistryID.c()
|
|||||||
This is a frequent hotspot for world loading/saving.
|
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
|
diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java
|
||||||
index e15d28671..e8a48b9a4 100644
|
index e15d286710..e8a48b9a4c 100644
|
||||||
--- a/src/main/java/net/minecraft/server/RegistryID.java
|
--- a/src/main/java/net/minecraft/server/RegistryID.java
|
||||||
+++ b/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<K> {
|
@@ -14,12 +14,14 @@ public class RegistryID<K> implements Registry<K> {
|
@ -1,11 +1,11 @@
|
|||||||
From f3277440873f3265faba99f17287e1be66c0d469 Mon Sep 17 00:00:00 2001
|
From f8153d56e39989b43ad547558d86ae105f3a3aab Mon Sep 17 00:00:00 2001
|
||||||
From: Hugo Manrique <hugmanrique@gmail.com>
|
From: Hugo Manrique <hugmanrique@gmail.com>
|
||||||
Date: Mon, 23 Jul 2018 12:57:39 +0200
|
Date: Mon, 23 Jul 2018 12:57:39 +0200
|
||||||
Subject: [PATCH] Option to prevent armor stands from doing entity lookups
|
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
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
index 83e54cb90..f06bb3ae1 100644
|
index 83e54cb904..f06bb3ae19 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
@@ -326,6 +326,11 @@ public class PaperWorldConfig {
|
@@ -326,6 +326,11 @@ public class PaperWorldConfig {
|
||||||
@ -21,10 +21,10 @@ index 83e54cb90..f06bb3ae1 100644
|
|||||||
private void maxEntityCollision() {
|
private void maxEntityCollision() {
|
||||||
maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
|
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
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index 00b7d90d7..31ffc57c9 100644
|
index db0c520394..8bb2e1bf0f 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -871,6 +871,14 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
@@ -869,6 +869,14 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,11 +1,11 @@
|
|||||||
From 6f0adf29a75988289f235bc55a15c65749d26fcd Mon Sep 17 00:00:00 2001
|
From 6d025cbfd76dcd75563b7a6b2a7e02e4c2eeb7a1 Mon Sep 17 00:00:00 2001
|
||||||
From: Hugo Manrique <hugmanrique@gmail.com>
|
From: Hugo Manrique <hugmanrique@gmail.com>
|
||||||
Date: Mon, 23 Jul 2018 14:22:26 +0200
|
Date: Mon, 23 Jul 2018 14:22:26 +0200
|
||||||
Subject: [PATCH] Vanished players don't have rights
|
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
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||||
index 54d025bf7..e3b1ebe62 100644
|
index 54d025bf7d..e3b1ebe629 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||||
@@ -97,7 +97,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@@ -97,7 +97,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||||
@ -18,7 +18,7 @@ index 54d025bf7..e3b1ebe62 100644
|
|||||||
protected int j;
|
protected int j;
|
||||||
private Entity vehicle;
|
private Entity vehicle;
|
||||||
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
|
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
|
||||||
index ee22bb038..e5a013ffd 100644
|
index ee22bb0387..e5a013ffd2 100644
|
||||||
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
|
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
|
||||||
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
|
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
|
||||||
@@ -22,9 +22,18 @@ public interface IEntityAccess {
|
@@ -22,9 +22,18 @@ public interface IEntityAccess {
|
||||||
@ -41,7 +41,7 @@ index ee22bb038..e5a013ffd 100644
|
|||||||
return VoxelShapes.c(voxelshape, VoxelShapes.a(entity1.getBoundingBox()), OperatorBoolean.AND);
|
return VoxelShapes.c(voxelshape, VoxelShapes.a(entity1.getBoundingBox()), OperatorBoolean.AND);
|
||||||
});
|
});
|
||||||
diff --git a/src/main/java/net/minecraft/server/IWorldReader.java b/src/main/java/net/minecraft/server/IWorldReader.java
|
diff --git a/src/main/java/net/minecraft/server/IWorldReader.java b/src/main/java/net/minecraft/server/IWorldReader.java
|
||||||
index 452b2b2d2..7019d4ae9 100644
|
index 452b2b2d28..7019d4ae99 100644
|
||||||
--- a/src/main/java/net/minecraft/server/IWorldReader.java
|
--- a/src/main/java/net/minecraft/server/IWorldReader.java
|
||||||
+++ b/src/main/java/net/minecraft/server/IWorldReader.java
|
+++ b/src/main/java/net/minecraft/server/IWorldReader.java
|
||||||
@@ -99,7 +99,12 @@ public interface IWorldReader extends IIBlockAccess {
|
@@ -99,7 +99,12 @@ public interface IWorldReader extends IIBlockAccess {
|
||||||
@ -58,7 +58,7 @@ index 452b2b2d2..7019d4ae9 100644
|
|||||||
|
|
||||||
return voxelshape.isEmpty() || this.a((Entity) null, voxelshape.a((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ()));
|
return voxelshape.isEmpty() || this.a((Entity) null, voxelshape.a((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ()));
|
||||||
diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
|
diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
|
||||||
index 59b1e6ce2..b90cc6652 100644
|
index 59b1e6ce2e..b90cc6652b 100644
|
||||||
--- a/src/main/java/net/minecraft/server/ItemBlock.java
|
--- a/src/main/java/net/minecraft/server/ItemBlock.java
|
||||||
+++ b/src/main/java/net/minecraft/server/ItemBlock.java
|
+++ b/src/main/java/net/minecraft/server/ItemBlock.java
|
||||||
@@ -126,7 +126,8 @@ public class ItemBlock extends Item {
|
@@ -126,7 +126,8 @@ public class ItemBlock extends Item {
|
||||||
@ -72,7 +72,7 @@ index 59b1e6ce2..b90cc6652 100644
|
|||||||
|
|
||||||
BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn);
|
BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn);
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||||
index ceffcec72..b39886c5d 100644
|
index ceffcec720..b39886c5d0 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||||
@@ -1120,6 +1120,14 @@ public class CraftEventFactory {
|
@@ -1120,6 +1120,14 @@ public class CraftEventFactory {
|
@ -1,4 +1,4 @@
|
|||||||
From 99005843982ad2e93d78f12cfedc8f10344741a1 Mon Sep 17 00:00:00 2001
|
From 050b9d851f88b5d429c2af21566ad1c5a00c42de Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Mon, 23 Jul 2018 22:18:31 -0400
|
Date: Mon, 23 Jul 2018 22:18:31 -0400
|
||||||
Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
|
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
|
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||||||
index 7382a47d8..8a8c8f4e8 100644
|
index 7382a47d8c..8a8c8f4e88 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Chunk.java
|
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||||||
@@ -411,6 +411,7 @@ public class Chunk implements IChunkAccess {
|
@@ -411,6 +411,7 @@ public class Chunk implements IChunkAccess {
|
@ -1,4 +1,4 @@
|
|||||||
From bcc772b0a83f8c5a792ff5439b4220238a7665e1 Mon Sep 17 00:00:00 2001
|
From 7d914605d5222acf7321f74a6bfa36d8d20ec3dc Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Mon, 23 Jul 2018 22:44:23 -0400
|
Date: Mon, 23 Jul 2018 22:44:23 -0400
|
||||||
Subject: [PATCH] Add some Debug to Chunk Entity slices
|
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
|
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
|
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||||||
index 8a8c8f4e8..fd91cf839 100644
|
index 8a8c8f4e88..fd91cf8393 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Chunk.java
|
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||||||
@@ -403,6 +403,25 @@ public class Chunk implements IChunkAccess {
|
@@ -403,6 +403,25 @@ public class Chunk implements IChunkAccess {
|
||||||
@ -57,7 +57,7 @@ index 8a8c8f4e8..fd91cf839 100644
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||||
index e3b1ebe62..2484eb0ff 100644
|
index e3b1ebe629..2484eb0ffd 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||||
@@ -67,6 +67,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@@ -67,6 +67,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@ -1,11 +1,11 @@
|
|||||||
From 9445ddab593fabafef6dda16ad36326e013cf29d Mon Sep 17 00:00:00 2001
|
From 842e70df880203be20a474b4d34105c5e47ec387 Mon Sep 17 00:00:00 2001
|
||||||
From: Anthony MacAllister <anthonymmacallister@gmail.com>
|
From: Anthony MacAllister <anthonymmacallister@gmail.com>
|
||||||
Date: Thu, 26 Jul 2018 15:30:03 -0400
|
Date: Thu, 26 Jul 2018 15:30:03 -0400
|
||||||
Subject: [PATCH] EntityTransformedEvent
|
Subject: [PATCH] EntityTransformedEvent
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
|
diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
|
||||||
index bb3493c14..de787d861 100644
|
index bb3493c14f..de787d8614 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
|
--- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
|
+++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
|
||||||
@@ -101,6 +101,7 @@ public class EntityMushroomCow extends EntityCow {
|
@@ -101,6 +101,7 @@ public class EntityMushroomCow extends EntityCow {
|
||||||
@ -17,7 +17,7 @@ index bb3493c14..de787d861 100644
|
|||||||
|
|
||||||
this.die(); // CraftBukkit - from above
|
this.die(); // CraftBukkit - from above
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
|
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
|
||||||
index 53e2266a9..f2b46d4e3 100644
|
index 53e2266a99..f2b46d4e3b 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityVillager.java
|
--- a/src/main/java/net/minecraft/server/EntityVillager.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
|
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
|
||||||
@@ -596,6 +596,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
@@ -596,6 +596,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||||||
@ -29,7 +29,7 @@ index 53e2266a9..f2b46d4e3 100644
|
|||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
this.die();
|
this.die();
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
|
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
|
||||||
index 4cb305ff2..171c1ae4a 100644
|
index 4cb305ff28..171c1ae4ad 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityZombie.java
|
--- a/src/main/java/net/minecraft/server/EntityZombie.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
|
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
|
||||||
@@ -247,6 +247,7 @@ public class EntityZombie extends EntityMonster {
|
@@ -247,6 +247,7 @@ public class EntityZombie extends EntityMonster {
|
||||||
@ -49,7 +49,7 @@ index 4cb305ff2..171c1ae4a 100644
|
|||||||
this.world.addEntity(entityzombievillager, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason
|
this.world.addEntity(entityzombievillager, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
|
diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
|
||||||
index b5d079233..a857d70e9 100644
|
index b5d0792332..a857d70e98 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
|
--- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
|
+++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
|
||||||
@@ -157,6 +157,7 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
|
@@ -157,6 +157,7 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
|
@ -1,11 +1,11 @@
|
|||||||
From 9fadebcc1ea54b2f9fcbb43035eadd4c4a6c0ed0 Mon Sep 17 00:00:00 2001
|
From 12804043aa8b6dbe1e09df215fdd14b4ce33b110 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Fri, 27 Jul 2018 22:36:31 -0500
|
Date: Fri, 27 Jul 2018 22:36:31 -0500
|
||||||
Subject: [PATCH] SkeletonHorse Additions
|
Subject: [PATCH] SkeletonHorse Additions
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
|
diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
|
||||||
index 9ac34dfa8..b96726456 100644
|
index 9ac34dfa8c..b967264562 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
|
--- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
|
+++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
|
||||||
@@ -6,7 +6,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
|
@@ -6,7 +6,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
|
||||||
@ -31,7 +31,7 @@ index 9ac34dfa8..b96726456 100644
|
|||||||
if (flag != this.bK) {
|
if (flag != this.bK) {
|
||||||
this.bK = flag;
|
this.bK = flag;
|
||||||
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
|
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
|
||||||
index 7b0a6f82f..f09374413 100644
|
index 7b0a6f82fb..f093744136 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
|
--- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
|
+++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
|
||||||
@@ -15,6 +15,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
|
@@ -15,6 +15,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
|
||||||
@ -43,7 +43,7 @@ index 7b0a6f82f..f09374413 100644
|
|||||||
|
|
||||||
this.a.r(false);
|
this.a.r(false);
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
|
||||||
index e822c2200..2a7d1d4ec 100644
|
index e822c2200d..2a7d1d4ec2 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
|
||||||
@@ -26,4 +26,26 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo
|
@@ -26,4 +26,26 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo
|
@ -1,4 +1,4 @@
|
|||||||
From fc1b1b28585b3818324213da7edaff5c56a43479 Mon Sep 17 00:00:00 2001
|
From 491ddba93727b3dcf83e066b54dd33d9759adabb Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Thu, 26 Jul 2018 00:11:12 -0400
|
Date: Thu, 26 Jul 2018 00:11:12 -0400
|
||||||
Subject: [PATCH] Prevent Saving Bad entities to chunks
|
Subject: [PATCH] Prevent Saving Bad entities to chunks
|
||||||
@ -18,7 +18,7 @@ an invalid entity.
|
|||||||
This should reduce log occurrences of dupe uuid messages.
|
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
|
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||||
index 2b8148fbd..9038d17fd 100644
|
index 2b8148fbda..9038d17fde 100644
|
||||||
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||||
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||||
@@ -332,6 +332,7 @@ public class ChunkRegionLoader {
|
@@ -332,6 +332,7 @@ public class ChunkRegionLoader {
|
@ -1,4 +1,4 @@
|
|||||||
From bd63bbb39ceefcad0b0dfb88f447461de4738dab Mon Sep 17 00:00:00 2001
|
From f0b06a840addc891ecede4b0a2d6c58b1ae85515 Mon Sep 17 00:00:00 2001
|
||||||
From: Hugo Manrique <hugmanrique@gmail.com>
|
From: Hugo Manrique <hugmanrique@gmail.com>
|
||||||
Date: Thu, 26 Jul 2018 14:10:23 +0200
|
Date: Thu, 26 Jul 2018 14:10:23 +0200
|
||||||
Subject: [PATCH] Don't call getItemMeta on hasItemMeta
|
Subject: [PATCH] Don't call getItemMeta on hasItemMeta
|
||||||
@ -11,7 +11,7 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set.
|
|||||||
Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
|
Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||||||
index 1609e6bbb..8a6a13537 100644
|
index 1609e6bbb6..8a6a135372 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||||||
@@ -536,7 +536,7 @@ public final class CraftItemStack extends ItemStack {
|
@@ -536,7 +536,7 @@ public final class CraftItemStack extends ItemStack {
|
||||||
@ -24,7 +24,7 @@ index 1609e6bbb..8a6a13537 100644
|
|||||||
|
|
||||||
static boolean hasItemMeta(net.minecraft.server.ItemStack item) {
|
static boolean hasItemMeta(net.minecraft.server.ItemStack item) {
|
||||||
diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
||||||
index 2a0852675..f30f74312 100644
|
index 2a0852675b..f30f743121 100644
|
||||||
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
||||||
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
||||||
@@ -4,6 +4,7 @@ import static org.hamcrest.Matchers.*;
|
@@ -4,6 +4,7 @@ import static org.hamcrest.Matchers.*;
|
@ -1,4 +1,4 @@
|
|||||||
From 359367a6f4bf33da4fdeec175017cf835ff03bc6 Mon Sep 17 00:00:00 2001
|
From a7f1b83ec26d41f82f0a4255f947ba8fef27f882 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sat, 28 Jul 2018 12:18:27 -0400
|
Date: Sat, 28 Jul 2018 12:18:27 -0400
|
||||||
Subject: [PATCH] Ignore Dead Entities in entityList iteration
|
Subject: [PATCH] Ignore Dead Entities in entityList iteration
|
||||||
@ -11,7 +11,7 @@ This will ensure that dead entities are skipped from iteration since
|
|||||||
they shouldn't of been in the list in the first place.
|
they shouldn't of been in the list in the first place.
|
||||||
|
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
|
||||||
index ce190d88d..352a39dcb 100644
|
index ce190d88d6..352a39dcb3 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
|
--- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
|
||||||
@@ -176,6 +176,7 @@ public class PaperCommand extends Command {
|
@@ -176,6 +176,7 @@ public class PaperCommand extends Command {
|
||||||
@ -23,7 +23,7 @@ index ce190d88d..352a39dcb 100644
|
|||||||
MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
|
MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
|
||||||
ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
|
ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
|
||||||
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||||||
index fd91cf839..2b4ad100e 100644
|
index fd91cf8393..2b4ad100e0 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Chunk.java
|
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||||||
@@ -643,6 +643,7 @@ public class Chunk implements IChunkAccess {
|
@@ -643,6 +643,7 @@ public class Chunk implements IChunkAccess {
|
||||||
@ -51,7 +51,7 @@ index fd91cf839..2b4ad100e 100644
|
|||||||
if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
|
if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
|
||||||
list.add(t0);
|
list.add(t0);
|
||||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||||
index 2484eb0ff..622160ff4 100644
|
index 2484eb0ffd..622160ff4e 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||||
@@ -126,6 +126,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@@ -126,6 +126,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||||
@ -63,7 +63,7 @@ index 2484eb0ff..622160ff4 100644
|
|||||||
private float av;
|
private float av;
|
||||||
private float aw;
|
private float aw;
|
||||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
index 6f298d737..74917a3b1 100644
|
index 957ca12e4a..364f26b556 100644
|
||||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
@@ -836,6 +836,7 @@ public class WorldServer extends World {
|
@@ -836,6 +836,7 @@ public class WorldServer extends World {
|
||||||
@ -91,7 +91,7 @@ index 6f298d737..74917a3b1 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
index 9a9c5a93e..20f7c44b6 100644
|
index 9a9c5a93e6..20f7c44b65 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
@@ -847,6 +847,7 @@ public class CraftWorld implements World {
|
@@ -847,6 +847,7 @@ public class CraftWorld implements World {
|
@ -1,4 +1,4 @@
|
|||||||
From 041dd87c43cf13c216c0820f5c22d5b8cf3eb49b Mon Sep 17 00:00:00 2001
|
From 0c747969dc199cf6e1a914b30a64c294078e8749 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sun, 29 Jul 2018 15:48:50 -0400
|
Date: Sun, 29 Jul 2018 15:48:50 -0400
|
||||||
Subject: [PATCH] Provide option to use a versioned world folder for testing
|
Subject: [PATCH] Provide option to use a versioned world folder for testing
|
||||||
@ -19,7 +19,7 @@ may be some delay there, but region files are only copied on demand.
|
|||||||
This is highly experiemental so backup your world before relying on this to not modify it
|
This is highly experiemental so backup your world before relying on this to not modify it
|
||||||
|
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
index a9b71c85d..8c3880c83 100644
|
index a9b71c85d5..8c3880c838 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
@@ -13,6 +13,7 @@ import java.util.List;
|
@@ -13,6 +13,7 @@ import java.util.List;
|
||||||
@ -59,7 +59,7 @@ index a9b71c85d..8c3880c83 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
|
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
|
||||||
index 6425b14f2..990d34efd 100644
|
index 6425b14f2c..990d34efde 100644
|
||||||
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
|
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
|
||||||
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
|
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
|
||||||
@@ -10,13 +10,41 @@ import java.io.IOException;
|
@@ -10,13 +10,41 @@ import java.io.IOException;
|
||||||
@ -163,7 +163,7 @@ index 6425b14f2..990d34efd 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
|
diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
|
||||||
index 350ac42d6..eaae44686 100644
|
index 350ac42d6b..eaae446861 100644
|
||||||
--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
|
--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
|
||||||
+++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
|
+++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
|
||||||
@@ -31,6 +31,58 @@ public class WorldNBTStorage implements IPlayerFileData {
|
@@ -31,6 +31,58 @@ public class WorldNBTStorage implements IPlayerFileData {
|
@ -1,4 +1,4 @@
|
|||||||
From 5612bef1b06db635c34ca0ee56936e82e53459b2 Mon Sep 17 00:00:00 2001
|
From a42c3271ebaa68a39a5ab5f426f91de7a9528d9c Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sun, 29 Jul 2018 22:58:47 -0400
|
Date: Sun, 29 Jul 2018 22:58:47 -0400
|
||||||
Subject: [PATCH] MC-111480: Start Entity ID's at 1
|
Subject: [PATCH] MC-111480: Start Entity ID's at 1
|
||||||
@ -7,7 +7,7 @@ DataWatchers that store Entity ID's treat 0 as special,
|
|||||||
and can break things such as Elytra Fireworks.
|
and can break things such as Elytra Fireworks.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||||
index 622160ff4..e1c793aad 100644
|
index 622160ff4e..e1c793aad5 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||||
+++ b/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
|
@@ -92,7 +92,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@ -1,4 +1,4 @@
|
|||||||
From 7e20108512afe0d71890499c0e478c517bdb8b83 Mon Sep 17 00:00:00 2001
|
From ac627e942e7d52d39d98ee92cbee0c16c853d60e Mon Sep 17 00:00:00 2001
|
||||||
From: willies952002 <admin@domnian.com>
|
From: willies952002 <admin@domnian.com>
|
||||||
Date: Thu, 26 Jul 2018 02:25:46 -0400
|
Date: Thu, 26 Jul 2018 02:25:46 -0400
|
||||||
Subject: [PATCH] Implement Expanded ArmorStand API
|
Subject: [PATCH] Implement Expanded ArmorStand API
|
||||||
@ -8,7 +8,7 @@ Add the following:
|
|||||||
- Enable/Disable slot interactions
|
- Enable/Disable slot interactions
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||||
index 916eaa7b9..00ff1e80d 100644
|
index 916eaa7b90..00ff1e80de 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
|
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||||
@@ -36,7 +36,7 @@ public class EntityArmorStand extends EntityLiving {
|
@@ -36,7 +36,7 @@ public class EntityArmorStand extends EntityLiving {
|
||||||
@ -29,7 +29,7 @@ index 916eaa7b9..00ff1e80d 100644
|
|||||||
return (this.bE & 1 << enumitemslot.c()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms();
|
return (this.bE & 1 << enumitemslot.c()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms();
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
||||||
index 124c3185b..9f5c3b92e 100644
|
index 124c3185bc..9f5c3b92e3 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
||||||
@@ -30,11 +30,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
|
@@ -30,11 +30,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
|
@ -1,11 +1,11 @@
|
|||||||
From b57c867923c316a4532d92b23eea8f00b2c70046 Mon Sep 17 00:00:00 2001
|
From 4dc9d56762d4f1da8a2af8923e803f7e7f8bff73 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Fri, 20 Jul 2018 23:37:03 -0500
|
Date: Fri, 20 Jul 2018 23:37:03 -0500
|
||||||
Subject: [PATCH] AnvilDamageEvent
|
Subject: [PATCH] AnvilDamageEvent
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
|
diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
|
||||||
index ada5cf982..9e73e731b 100644
|
index ada5cf982e..9e73e731b5 100644
|
||||||
--- a/src/main/java/net/minecraft/server/ContainerAnvil.java
|
--- a/src/main/java/net/minecraft/server/ContainerAnvil.java
|
||||||
+++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
|
+++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
|
||||||
@@ -85,6 +85,16 @@ public class ContainerAnvil extends Container {
|
@@ -85,6 +85,16 @@ public class ContainerAnvil extends Container {
|
@ -1,11 +1,11 @@
|
|||||||
From c67e9c23bbe0f37866002b4a84be8e0e144e7d0a Mon Sep 17 00:00:00 2001
|
From 30f65ec54840c18c24d0a459f73d77de7cd6d3c4 Mon Sep 17 00:00:00 2001
|
||||||
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
|
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
|
||||||
Date: Mon, 16 Jul 2018 00:05:05 +0300
|
Date: Mon, 16 Jul 2018 00:05:05 +0300
|
||||||
Subject: [PATCH] Add TNTPrimeEvent
|
Subject: [PATCH] Add TNTPrimeEvent
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
|
diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
|
||||||
index f769df41a..087535caf 100644
|
index f769df41a6..087535caf9 100644
|
||||||
--- a/src/main/java/net/minecraft/server/BlockFire.java
|
--- a/src/main/java/net/minecraft/server/BlockFire.java
|
||||||
+++ b/src/main/java/net/minecraft/server/BlockFire.java
|
+++ b/src/main/java/net/minecraft/server/BlockFire.java
|
||||||
@@ -2,6 +2,7 @@ package net.minecraft.server;
|
@@ -2,6 +2,7 @@ package net.minecraft.server;
|
||||||
@ -39,7 +39,7 @@ index f769df41a..087535caf 100644
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
|
diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
|
||||||
index 013fa3524..7e534417b 100644
|
index 013fa35241..7e534417ba 100644
|
||||||
--- a/src/main/java/net/minecraft/server/BlockTNT.java
|
--- a/src/main/java/net/minecraft/server/BlockTNT.java
|
||||||
+++ b/src/main/java/net/minecraft/server/BlockTNT.java
|
+++ b/src/main/java/net/minecraft/server/BlockTNT.java
|
||||||
@@ -1,6 +1,7 @@
|
@@ -1,6 +1,7 @@
|
||||||
@ -114,7 +114,7 @@ index 013fa3524..7e534417b 100644
|
|||||||
world.a(blockposition, false);
|
world.a(blockposition, false);
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
|
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
|
||||||
index d42d4e83e..9ada10cc7 100644
|
index d42d4e83ef..9ada10cc73 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
|
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
|
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
|
||||||
@@ -11,6 +11,7 @@ import org.bukkit.craftbukkit.block.CraftBlock;
|
@@ -11,6 +11,7 @@ import org.bukkit.craftbukkit.block.CraftBlock;
|
@ -1,4 +1,4 @@
|
|||||||
From a52d0d7dbfa1059beaf5343bf01a9a00ef1c25d6 Mon Sep 17 00:00:00 2001
|
From c7fd6f4d00a7b5a70cb146a6b6cdd587665b172d Mon Sep 17 00:00:00 2001
|
||||||
From: Shane Freeder <theboyetronic@gmail.com>
|
From: Shane Freeder <theboyetronic@gmail.com>
|
||||||
Date: Sun, 29 Jul 2018 05:02:15 +0100
|
Date: Sun, 29 Jul 2018 05:02:15 +0100
|
||||||
Subject: [PATCH] Break up and make tab spam limits configurable
|
Subject: [PATCH] Break up and make tab spam limits configurable
|
||||||
@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
|
|||||||
plugins doing unsafe things.
|
plugins doing unsafe things.
|
||||||
|
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
index 8c3880c83..d773ef5b0 100644
|
index 8c3880c838..d773ef5b0d 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
@@ -311,4 +311,18 @@ public class PaperConfig {
|
@@ -311,4 +311,18 @@ public class PaperConfig {
|
||||||
@ -45,7 +45,7 @@ index 8c3880c83..d773ef5b0 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
index 4c99a321b..07e9abda9 100644
|
index 4c99a321b7..07e9abda96 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
@@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
@@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
@ -1,11 +1,11 @@
|
|||||||
From e601e535b8d90cf48e04a2275c8c54489c702d69 Mon Sep 17 00:00:00 2001
|
From b083584ee954bf4198666f4e4ed2e68db35fae72 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Thu, 2 Aug 2018 08:44:35 -0500
|
Date: Thu, 2 Aug 2018 08:44:35 -0500
|
||||||
Subject: [PATCH] Add hand to bucket events
|
Subject: [PATCH] Add hand to bucket events
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
|
diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
|
||||||
index a17738f9f..d2c2e3cc3 100644
|
index a17738f9ff..d2c2e3cc33 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityCow.java
|
--- a/src/main/java/net/minecraft/server/EntityCow.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityCow.java
|
+++ b/src/main/java/net/minecraft/server/EntityCow.java
|
||||||
@@ -62,7 +62,7 @@ public class EntityCow extends EntityAnimal {
|
@@ -62,7 +62,7 @@ public class EntityCow extends EntityAnimal {
|
||||||
@ -18,7 +18,7 @@ index a17738f9f..d2c2e3cc3 100644
|
|||||||
if (event.isCancelled()) {
|
if (event.isCancelled()) {
|
||||||
return false;
|
return false;
|
||||||
diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
|
diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
|
||||||
index cb2891411..5dc967f8b 100644
|
index cb28914118..5dc967f8ba 100644
|
||||||
--- a/src/main/java/net/minecraft/server/ItemBucket.java
|
--- a/src/main/java/net/minecraft/server/ItemBucket.java
|
||||||
+++ b/src/main/java/net/minecraft/server/ItemBucket.java
|
+++ b/src/main/java/net/minecraft/server/ItemBucket.java
|
||||||
@@ -39,7 +39,7 @@ public class ItemBucket extends Item {
|
@@ -39,7 +39,7 @@ public class ItemBucket extends Item {
|
||||||
@ -67,7 +67,7 @@ index cb2891411..5dc967f8b 100644
|
|||||||
((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity
|
((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity
|
||||||
((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
|
((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||||
index b39886c5d..9380b4953 100644
|
index b39886c5d0..9380b4953f 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||||
@@ -354,6 +354,20 @@ public class CraftEventFactory {
|
@@ -354,6 +354,20 @@ public class CraftEventFactory {
|
@ -1,11 +1,11 @@
|
|||||||
From 3d7cbb58d3a12b7d4d5cbca380f25337c7186d61 Mon Sep 17 00:00:00 2001
|
From 86cc4d27c6c9b1f4295f5f516d1b327e13b88856 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Fri, 3 Aug 2018 00:04:54 -0400
|
Date: Fri, 3 Aug 2018 00:04:54 -0400
|
||||||
Subject: [PATCH] MC-135506: Experience should save as Integers
|
Subject: [PATCH] MC-135506: Experience should save as Integers
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
|
diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
|
||||||
index 64d71a9a2..65c996961 100644
|
index 64d71a9a2a..65c9969613 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
|
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
|
+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
|
||||||
@@ -204,7 +204,7 @@ public class EntityExperienceOrb extends Entity {
|
@@ -204,7 +204,7 @@ public class EntityExperienceOrb extends Entity {
|
@ -1,4 +1,4 @@
|
|||||||
From f02d6679d5a68fdd5878e7d68a18e42391915a3b Mon Sep 17 00:00:00 2001
|
From e1f63e935ea51043e1b30c5f7876aa27643e2826 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Tue, 22 Nov 2016 00:40:42 -0500
|
Date: Tue, 22 Nov 2016 00:40:42 -0500
|
||||||
Subject: [PATCH] Fix client rendering skulls from same user
|
Subject: [PATCH] Fix client rendering skulls from same user
|
||||||
@ -12,7 +12,7 @@ This allows the client to render multiple skull textures from the same user,
|
|||||||
for when different skins were used when skull was made.
|
for when different skins were used when skull was made.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
|
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
|
||||||
index 2acd02f2f..ca1bd0299 100644
|
index 2acd02f2f4..ca1bd02995 100644
|
||||||
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
||||||
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
||||||
@@ -54,7 +54,7 @@ public final class ItemStack {
|
@@ -54,7 +54,7 @@ public final class ItemStack {
|
||||||
@ -25,7 +25,7 @@ index 2acd02f2f..ca1bd0299 100644
|
|||||||
private EntityItemFrame i;
|
private EntityItemFrame i;
|
||||||
private ShapeDetectorBlock j;
|
private ShapeDetectorBlock j;
|
||||||
diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
|
diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
|
||||||
index 0d67676f7..fa2d3ce8c 100644
|
index 0d67676f7d..fa2d3ce8cb 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
|
--- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
|
+++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
|
||||||
@@ -253,6 +253,15 @@ public class PacketDataSerializer extends ByteBuf {
|
@@ -253,6 +253,15 @@ public class PacketDataSerializer extends ByteBuf {
|
||||||
@ -62,7 +62,7 @@ index 0d67676f7..fa2d3ce8c 100644
|
|||||||
}
|
}
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
|
diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
|
||||||
index 363ab5da1..d19a30ad8 100644
|
index 363ab5da12..d19a30ad87 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
|
--- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
|
+++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
|
||||||
@@ -51,6 +51,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
|
@@ -51,6 +51,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
|
||||||
@ -74,7 +74,7 @@ index 363ab5da1..d19a30ad8 100644
|
|||||||
this.f.add(nbttagcompound);
|
this.f.add(nbttagcompound);
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
|
diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
|
||||||
index f6a80a00f..5306574e5 100644
|
index f6a80a00f4..5306574e55 100644
|
||||||
--- a/src/main/java/net/minecraft/server/TileEntitySkull.java
|
--- a/src/main/java/net/minecraft/server/TileEntitySkull.java
|
||||||
+++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
|
+++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
|
||||||
@@ -142,9 +142,37 @@ public class TileEntitySkull extends TileEntity /*implements ITickable*/ { // Pa
|
@@ -142,9 +142,37 @@ public class TileEntitySkull extends TileEntity /*implements ITickable*/ { // Pa
|
@ -1,4 +1,4 @@
|
|||||||
From 1348f0740b628fbbcc2f6bca3b18dcd9f679b999 Mon Sep 17 00:00:00 2001
|
From 756307a54e45d15f96f071b2f955c68181f56441 Mon Sep 17 00:00:00 2001
|
||||||
From: miclebrick <miclebrick@outlook.com>
|
From: miclebrick <miclebrick@outlook.com>
|
||||||
Date: Wed, 8 Aug 2018 15:30:52 -0400
|
Date: Wed, 8 Aug 2018 15:30:52 -0400
|
||||||
Subject: [PATCH] Add Early Warning Feature to WatchDog
|
Subject: [PATCH] Add Early Warning Feature to WatchDog
|
||||||
@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
|
|||||||
This will help diagnose what was going on in that time before the crash.
|
This will help diagnose what was going on in that time before the crash.
|
||||||
|
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
index d773ef5b0..833659bbb 100644
|
index d773ef5b0d..833659bbb2 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
@@ -25,6 +25,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
|
@@ -25,6 +25,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
|
||||||
@ -36,7 +36,7 @@ index d773ef5b0..833659bbb 100644
|
|||||||
public static int tabSpamLimit = 500;
|
public static int tabSpamLimit = 500;
|
||||||
private static void tabSpamLimiters() {
|
private static void tabSpamLimiters() {
|
||||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
index ea3d9e9af..9b11fd838 100644
|
index ea3d9e9afa..9b11fd838b 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -847,6 +847,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
@@ -847,6 +847,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||||
@ -48,7 +48,7 @@ index ea3d9e9af..9b11fd838 100644
|
|||||||
long start = System.nanoTime(), curTime, wait, tickSection = start; // Paper - Further improve server tick loop
|
long start = System.nanoTime(), curTime, wait, tickSection = start; // Paper - Further improve server tick loop
|
||||||
lastTick = start - TICK_TIME; // Paper
|
lastTick = start - TICK_TIME; // Paper
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
index 4fe8e198f..770dbf605 100644
|
index 4fe8e198f2..770dbf6052 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
@@ -754,6 +754,7 @@ public final class CraftServer implements Server {
|
@@ -754,6 +754,7 @@ public final class CraftServer implements Server {
|
||||||
@ -68,7 +68,7 @@ index 4fe8e198f..770dbf605 100644
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
||||||
index 6c5430ff9..4b8581f0e 100644
|
index 6c5430ff94..4b8581f0ed 100644
|
||||||
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
||||||
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
||||||
@@ -225,7 +225,7 @@ public class SpigotConfig
|
@@ -225,7 +225,7 @@ public class SpigotConfig
|
||||||
@ -81,7 +81,7 @@ index 6c5430ff9..4b8581f0e 100644
|
|||||||
|
|
||||||
public static boolean bungee;
|
public static boolean bungee;
|
||||||
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
|
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
|
||||||
index 9532aada8..a1d93200e 100644
|
index 9532aada82..a1d93200e6 100644
|
||||||
--- a/src/main/java/org/spigotmc/WatchdogThread.java
|
--- a/src/main/java/org/spigotmc/WatchdogThread.java
|
||||||
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
|
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
|
||||||
@@ -5,6 +5,7 @@ import java.lang.management.MonitorInfo;
|
@@ -5,6 +5,7 @@ import java.lang.management.MonitorInfo;
|
@ -1,11 +1,11 @@
|
|||||||
From 89218536bfa31888b2d562669ae0bd41258a8358 Mon Sep 17 00:00:00 2001
|
From 038cd7f34628d8e3c4712879305f52cbc05ef016 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Fri, 10 Aug 2018 22:11:49 -0400
|
Date: Fri, 10 Aug 2018 22:11:49 -0400
|
||||||
Subject: [PATCH] Make EnderDragon implement Mob
|
Subject: [PATCH] Make EnderDragon implement Mob
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
|
||||||
index cc115cc36..4947249da 100644
|
index cc115cc368..4947249da2 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
|
||||||
@@ -1,17 +1,18 @@
|
@@ -1,17 +1,18 @@
|
@ -1,4 +1,4 @@
|
|||||||
From a2b6a6be1167a19be210fd71878a492081f010f9 Mon Sep 17 00:00:00 2001
|
From 1907814dffa81dcc72a3072d1d75c6b98ea6aae1 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sat, 11 Aug 2018 00:49:20 -0400
|
Date: Sat, 11 Aug 2018 00:49:20 -0400
|
||||||
Subject: [PATCH] Detect and repair corrupt Region Files
|
Subject: [PATCH] Detect and repair corrupt Region Files
|
||||||
@ -11,7 +11,7 @@ I don't know why mojang only checks for 4096, when anything less than 8192 is a
|
|||||||
But to be safe, it will attempt to back up the file.
|
But to be safe, it will attempt to back up the file.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
|
diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
|
||||||
index 4e6288e8b..e68f90194 100644
|
index 4e6288e8bb..e68f901943 100644
|
||||||
--- a/src/main/java/net/minecraft/server/RegionFile.java
|
--- a/src/main/java/net/minecraft/server/RegionFile.java
|
||||||
+++ b/src/main/java/net/minecraft/server/RegionFile.java
|
+++ b/src/main/java/net/minecraft/server/RegionFile.java
|
||||||
@@ -27,13 +27,13 @@ public class RegionFile implements AutoCloseable {
|
@@ -27,13 +27,13 @@ public class RegionFile implements AutoCloseable {
|
@ -1,4 +1,4 @@
|
|||||||
From beb8d7152eb7655368b1dffaab07ce6b87f84ef7 Mon Sep 17 00:00:00 2001
|
From 00cace922105b799fc3723606102a64381927a37 Mon Sep 17 00:00:00 2001
|
||||||
From: egg82 <phantom_zero@ymail.com>
|
From: egg82 <phantom_zero@ymail.com>
|
||||||
Date: Tue, 7 Aug 2018 01:24:23 -0600
|
Date: Tue, 7 Aug 2018 01:24:23 -0600
|
||||||
Subject: [PATCH] Use ConcurrentHashMap in JsonList
|
Subject: [PATCH] Use ConcurrentHashMap in JsonList
|
||||||
@ -25,7 +25,7 @@ The point of this is readability, but does have a side-benefit of a small microp
|
|||||||
Finally, added a couple obfhelpers for the modified code
|
Finally, added a couple obfhelpers for the modified code
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
|
diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
|
||||||
index 04f98167d..c169d0176 100644
|
index 04f98167d3..c169d01762 100644
|
||||||
--- a/src/main/java/net/minecraft/server/JsonList.java
|
--- a/src/main/java/net/minecraft/server/JsonList.java
|
||||||
+++ b/src/main/java/net/minecraft/server/JsonList.java
|
+++ b/src/main/java/net/minecraft/server/JsonList.java
|
||||||
@@ -35,7 +35,8 @@ public class JsonList<K, V extends JsonListEntry<K>> {
|
@@ -35,7 +35,8 @@ public class JsonList<K, V extends JsonListEntry<K>> {
|
@ -1,4 +1,4 @@
|
|||||||
From 70e516c89bb8e424cd543ebda4909204a0f57d56 Mon Sep 17 00:00:00 2001
|
From aefc2a0f2769affc8daa6457811693f98a76b9a9 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sun, 12 Aug 2018 02:33:39 -0400
|
Date: Sun, 12 Aug 2018 02:33:39 -0400
|
||||||
Subject: [PATCH] Use a Queue for Queueing Commands
|
Subject: [PATCH] Use a Queue for Queueing Commands
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands
|
|||||||
Lists are bad as Queues mmmkay.
|
Lists are bad as Queues mmmkay.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||||
index c2c676e3b..3d452fe0e 100644
|
index c2c676e3bb..3d452fe0e3 100644
|
||||||
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||||
@@ -41,7 +41,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
@@ -41,7 +41,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
@ -1,11 +1,11 @@
|
|||||||
From 804b51b0c2d1eb8c487871cf51c16674646ce4d7 Mon Sep 17 00:00:00 2001
|
From 7855ba905d6a0b15bf63b0843cb124c1cd93c642 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Wed, 15 Aug 2018 01:16:34 -0400
|
Date: Wed, 15 Aug 2018 01:16:34 -0400
|
||||||
Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
|
Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
||||||
index 323f5bf28..f1db08c88 100644
|
index 323f5bf289..f1db08c880 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
||||||
@@ -118,6 +118,11 @@ public class CraftChunk implements Chunk {
|
@@ -118,6 +118,11 @@ public class CraftChunk implements Chunk {
|
@ -1,11 +1,11 @@
|
|||||||
From 110cbaa658e6539f2e153735527e95d03e74273f Mon Sep 17 00:00:00 2001
|
From 26e203adbd97c6c3f06225898c3a404fafc5bf0b Mon Sep 17 00:00:00 2001
|
||||||
From: kashike <kashike@vq.lc>
|
From: kashike <kashike@vq.lc>
|
||||||
Date: Wed, 15 Aug 2018 01:26:09 -0700
|
Date: Wed, 15 Aug 2018 01:26:09 -0700
|
||||||
Subject: [PATCH] Allow disabling armour stand ticking
|
Subject: [PATCH] Allow disabling armour stand ticking
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
index f06bb3ae1..a5b4f9990 100644
|
index f06bb3ae19..a5b4f99901 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
@@ -391,4 +391,10 @@ public class PaperWorldConfig {
|
@@ -391,4 +391,10 @@ public class PaperWorldConfig {
|
||||||
@ -20,7 +20,7 @@ index f06bb3ae1..a5b4f9990 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||||
index 00ff1e80d..5c35909eb 100644
|
index 00ff1e80de..5c35909eb2 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
|
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||||
@@ -44,6 +44,11 @@ public class EntityArmorStand extends EntityLiving {
|
@@ -44,6 +44,11 @@ public class EntityArmorStand extends EntityLiving {
|
||||||
@ -140,7 +140,7 @@ index 00ff1e80d..5c35909eb 100644
|
|||||||
|
|
||||||
public Vector3f r() {
|
public Vector3f r() {
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
index d52c0d81d..6334d3dea 100644
|
index d52c0d81dc..6334d3dea4 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
@@ -2259,52 +2259,7 @@ public abstract class EntityLiving extends Entity {
|
@@ -2259,52 +2259,7 @@ public abstract class EntityLiving extends Entity {
|
||||||
@ -256,7 +256,7 @@ index d52c0d81d..6334d3dea 100644
|
|||||||
float f2 = MathHelper.g(f - this.aK);
|
float f2 = MathHelper.g(f - this.aK);
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
||||||
index 9f5c3b92e..07ce93f17 100644
|
index 9f5c3b92e3..07ce93f17c 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
|
||||||
@@ -297,5 +297,15 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
|
@@ -297,5 +297,15 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
|
@ -1,4 +1,4 @@
|
|||||||
From 92b340b1290f3257cd825dc7b19ebccf24674c5e Mon Sep 17 00:00:00 2001
|
From 79c849ce04f1493659885a9ba00fcd9eb7a978e0 Mon Sep 17 00:00:00 2001
|
||||||
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
||||||
Date: Wed, 15 Aug 2018 12:05:12 -0700
|
Date: Wed, 15 Aug 2018 12:05:12 -0700
|
||||||
Subject: [PATCH] Optimize BlockPosition helper methods
|
Subject: [PATCH] Optimize BlockPosition helper methods
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] Optimize BlockPosition helper methods
|
|||||||
Resolves #1338
|
Resolves #1338
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
|
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
|
||||||
index a5e5a4eba..6ed584f8d 100644
|
index a5e5a4ebae..6ed584f8dd 100644
|
||||||
--- a/src/main/java/net/minecraft/server/BlockPosition.java
|
--- a/src/main/java/net/minecraft/server/BlockPosition.java
|
||||||
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
|
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
|
||||||
@@ -134,55 +134,72 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
|
@@ -134,55 +134,72 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
|
@ -1,11 +1,11 @@
|
|||||||
From bc54ff3205320313f9632d0b77303e50b602839e Mon Sep 17 00:00:00 2001
|
From a0dcb1421e802ad36276cf8ace778c55f8199777 Mon Sep 17 00:00:00 2001
|
||||||
From: Mystiflow <mystiflow@gmail.com>
|
From: Mystiflow <mystiflow@gmail.com>
|
||||||
Date: Fri, 6 Jul 2018 13:21:30 +0100
|
Date: Fri, 6 Jul 2018 13:21:30 +0100
|
||||||
Subject: [PATCH] Send nearby packets from world player list not server list
|
Subject: [PATCH] Send nearby packets from world player list not server list
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||||
index 006f7b8b9..af437120e 100644
|
index 006f7b8b9f..af437120ec 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||||
@@ -922,8 +922,25 @@ public abstract class PlayerList {
|
@@ -922,8 +922,25 @@ public abstract class PlayerList {
|
||||||
@ -46,10 +46,10 @@ index 006f7b8b9..af437120e 100644
|
|||||||
double d5 = d1 - entityplayer.locY;
|
double d5 = d1 - entityplayer.locY;
|
||||||
double d6 = d2 - entityplayer.locZ;
|
double d6 = d2 - entityplayer.locZ;
|
||||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
index 74917a3b1..892c49506 100644
|
index 364f26b556..9860175ec4 100644
|
||||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
@@ -1182,7 +1182,7 @@ public class WorldServer extends World {
|
@@ -1179,7 +1179,7 @@ public class WorldServer extends World {
|
||||||
}
|
}
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
this.globalEntityList.add(entitylightning);
|
this.globalEntityList.add(entitylightning);
|
||||||
@ -58,7 +58,7 @@ index 74917a3b1..892c49506 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -1314,7 +1314,7 @@ public class WorldServer extends World {
|
@@ -1311,7 +1311,7 @@ public class WorldServer extends World {
|
||||||
BlockActionData blockactiondata = (BlockActionData) this.J.removeFirst();
|
BlockActionData blockactiondata = (BlockActionData) this.J.removeFirst();
|
||||||
|
|
||||||
if (this.a(blockactiondata)) {
|
if (this.a(blockactiondata)) {
|
||||||
@ -68,7 +68,7 @@ index 74917a3b1..892c49506 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
index 20f7c44b6..9601d412a 100644
|
index 20f7c44b65..9601d412ab 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
@@ -1910,7 +1910,7 @@ public class CraftWorld implements World {
|
@@ -1910,7 +1910,7 @@ public class CraftWorld implements World {
|
@ -1,11 +1,11 @@
|
|||||||
From 4c96032b5b18ebc5509bf2fb920bf682f22bd52b Mon Sep 17 00:00:00 2001
|
From 1d6b7fcd69eb411a3d49314954fc80054cab1d52 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sat, 18 Aug 2018 12:43:16 -0400
|
Date: Sat, 18 Aug 2018 12:43:16 -0400
|
||||||
Subject: [PATCH] Restore vanlla default mob-spawn-range
|
Subject: [PATCH] Restore vanlla default mob-spawn-range
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
||||||
index 9a51c0ef7..c2bf481a6 100644
|
index 9a51c0ef7a..c2bf481a60 100644
|
||||||
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
||||||
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
||||||
@@ -152,7 +152,7 @@ public class SpigotWorldConfig
|
@@ -152,7 +152,7 @@ public class SpigotWorldConfig
|
@ -1,4 +1,4 @@
|
|||||||
From 0a9775472f2a516c4e0c2481c409b04495c7d745 Mon Sep 17 00:00:00 2001
|
From 30231c8e9b612ba94f005574d442dd816b601455 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Wed, 27 Apr 2016 22:09:52 -0400
|
Date: Wed, 27 Apr 2016 22:09:52 -0400
|
||||||
Subject: [PATCH] Optimize Hoppers
|
Subject: [PATCH] Optimize Hoppers
|
||||||
@ -11,7 +11,7 @@ Subject: [PATCH] Optimize Hoppers
|
|||||||
* Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
|
* Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
|
||||||
|
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
index a5b4f9990..2b5402b00 100644
|
index a5b4f99901..2b5402b009 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
@@ -360,6 +360,15 @@ public class PaperWorldConfig {
|
@@ -360,6 +360,15 @@ public class PaperWorldConfig {
|
||||||
@ -31,7 +31,7 @@ index a5b4f9990..2b5402b00 100644
|
|||||||
private void disableSprintInterruptionOnAttack() {
|
private void disableSprintInterruptionOnAttack() {
|
||||||
disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
|
disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
|
||||||
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
|
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
|
||||||
index ca1bd0299..2d83c9e79 100644
|
index ca1bd02995..2d83c9e79c 100644
|
||||||
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
||||||
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
||||||
@@ -482,8 +482,9 @@ public final class ItemStack {
|
@@ -482,8 +482,9 @@ public final class ItemStack {
|
||||||
@ -47,7 +47,7 @@ index ca1bd0299..2d83c9e79 100644
|
|||||||
itemstack.d(this.C());
|
itemstack.d(this.C());
|
||||||
if (this.tag != null) {
|
if (this.tag != null) {
|
||||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
index 9b11fd838..6a3776091 100644
|
index 9b11fd838b..6a3776091e 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -1135,6 +1135,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
@@ -1135,6 +1135,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||||
@ -59,7 +59,7 @@ index 9b11fd838..6a3776091 100644
|
|||||||
if (true || worldserver.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD || this.getAllowNether()) { // CraftBukkit
|
if (true || worldserver.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD || this.getAllowNether()) { // CraftBukkit
|
||||||
this.methodProfiler.a(() -> {
|
this.methodProfiler.a(() -> {
|
||||||
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
|
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
|
||||||
index 9f31f071b..6bddb2736 100644
|
index 9f31f071bb..6bddb27365 100644
|
||||||
--- a/src/main/java/net/minecraft/server/TileEntity.java
|
--- a/src/main/java/net/minecraft/server/TileEntity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/TileEntity.java
|
+++ b/src/main/java/net/minecraft/server/TileEntity.java
|
||||||
@@ -62,6 +62,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
|
@@ -62,6 +62,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
|
||||||
@ -79,7 +79,7 @@ index 9f31f071b..6bddb2736 100644
|
|||||||
this.world.b(this.position, this);
|
this.world.b(this.position, this);
|
||||||
if (!this.c.isAir()) {
|
if (!this.c.isAir()) {
|
||||||
diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
|
diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
|
||||||
index 0555bae5a..452e46cad 100644
|
index 0555bae5aa..452e46cad7 100644
|
||||||
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java
|
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java
|
||||||
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
|
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
|
||||||
@@ -189,6 +189,153 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
|
@@ -189,6 +189,153 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
|
@ -1,4 +1,4 @@
|
|||||||
From 74ef4c8fafe6b57b0fbb47c7a3d4e0e026d37385 Mon Sep 17 00:00:00 2001
|
From ed020cefa418b0ec20f621bbce505ffb319c0de1 Mon Sep 17 00:00:00 2001
|
||||||
From: miclebrick <miclebrick@outlook.com>
|
From: miclebrick <miclebrick@outlook.com>
|
||||||
Date: Thu, 23 Aug 2018 11:45:32 -0400
|
Date: Thu, 23 Aug 2018 11:45:32 -0400
|
||||||
Subject: [PATCH] Optimize CraftBlockData Creation
|
Subject: [PATCH] Optimize CraftBlockData Creation
|
||||||
@ -7,7 +7,7 @@ Avoids a hashmap lookup by cacheing a reference to the CraftBlockData
|
|||||||
and cloning it when one is needed.
|
and cloning it when one is needed.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
|
diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
|
||||||
index 0f4aa698a..c66cabe82 100644
|
index 0f4aa698aa..c66cabe82f 100644
|
||||||
--- a/src/main/java/net/minecraft/server/IBlockData.java
|
--- a/src/main/java/net/minecraft/server/IBlockData.java
|
||||||
+++ b/src/main/java/net/minecraft/server/IBlockData.java
|
+++ b/src/main/java/net/minecraft/server/IBlockData.java
|
||||||
@@ -4,6 +4,8 @@ import com.google.common.collect.ImmutableMap;
|
@@ -4,6 +4,8 @@ import com.google.common.collect.ImmutableMap;
|
||||||
@ -36,7 +36,7 @@ index 0f4aa698a..c66cabe82 100644
|
|||||||
return this.getBlock().l(this);
|
return this.getBlock().l(this);
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
|
||||||
index c1666a9ba..3c29abd52 100644
|
index c1666a9baf..3c29abd525 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
|
--- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
|
||||||
@@ -539,7 +539,17 @@ public class CraftBlockData implements BlockData {
|
@@ -539,7 +539,17 @@ public class CraftBlockData implements BlockData {
|
@ -1,11 +1,11 @@
|
|||||||
From 7d10f9c126cac888c661923da63c6a6775dc761c Mon Sep 17 00:00:00 2001
|
From 0d60a09b2e5e12c669cbbb0880c8ac78ee63c3c2 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Thu, 23 Aug 2018 09:25:30 -0500
|
Date: Thu, 23 Aug 2018 09:25:30 -0500
|
||||||
Subject: [PATCH] Fix MC-124320
|
Subject: [PATCH] Fix MC-124320
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
|
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
|
||||||
index dedb063de..8d69a1556 100644
|
index dedb063de8..8d69a1556a 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Block.java
|
--- a/src/main/java/net/minecraft/server/Block.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Block.java
|
+++ b/src/main/java/net/minecraft/server/Block.java
|
||||||
@@ -168,6 +168,7 @@ public class Block implements IMaterial {
|
@@ -168,6 +168,7 @@ public class Block implements IMaterial {
|
||||||
@ -17,7 +17,7 @@ index dedb063de..8d69a1556 100644
|
|||||||
IBlockData iblockdata1 = iblockdata;
|
IBlockData iblockdata1 = iblockdata;
|
||||||
BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
|
BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
|
diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
|
||||||
index 79d23f152..ad1553f6e 100644
|
index 79d23f1522..ad1553f6e9 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
|
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
|
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
|
||||||
@@ -335,8 +335,9 @@ public class EntityEnderman extends EntityMonster {
|
@@ -335,8 +335,9 @@ public class EntityEnderman extends EntityMonster {
|
@ -1,11 +1,11 @@
|
|||||||
From 4fb60ec90eef434b7450ae50d23e5a415b53068b Mon Sep 17 00:00:00 2001
|
From 57c6b03b5166380b8f24dfaee2ad8d2851bbf8fd Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Fri, 24 Aug 2018 08:18:42 -0500
|
Date: Fri, 24 Aug 2018 08:18:42 -0500
|
||||||
Subject: [PATCH] Slime Pathfinder Events
|
Subject: [PATCH] Slime Pathfinder Events
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
|
diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
|
||||||
index 96cf4bcce..e28c0673d 100644
|
index 96cf4bccea..e28c0673dd 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntitySlime.java
|
--- a/src/main/java/net/minecraft/server/EntitySlime.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntitySlime.java
|
+++ b/src/main/java/net/minecraft/server/EntitySlime.java
|
||||||
@@ -2,6 +2,14 @@ package net.minecraft.server;
|
@@ -2,6 +2,14 @@ package net.minecraft.server;
|
||||||
@ -147,7 +147,7 @@ index 96cf4bcce..e28c0673d 100644
|
|||||||
+ // Paper end
|
+ // Paper end
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
|
||||||
index ce6ed6e89..6e9f1b66d 100644
|
index ce6ed6e890..6e9f1b66df 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
|
||||||
@@ -35,4 +35,14 @@ public class CraftSlime extends CraftMob implements Slime {
|
@@ -35,4 +35,14 @@ public class CraftSlime extends CraftMob implements Slime {
|
@ -1,11 +1,11 @@
|
|||||||
From efe87209c910375ab5cd2d916b907e26f63ce57f Mon Sep 17 00:00:00 2001
|
From e239a54a6ced679fb3e92c1caa50abd682ce598d Mon Sep 17 00:00:00 2001
|
||||||
From: Byteflux <byte@byteflux.net>
|
From: Byteflux <byte@byteflux.net>
|
||||||
Date: Wed, 8 Aug 2018 16:33:21 -0600
|
Date: Wed, 8 Aug 2018 16:33:21 -0600
|
||||||
Subject: [PATCH] Configurable speed for water flowing over lava
|
Subject: [PATCH] Configurable speed for water flowing over lava
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
index 2b5402b00..2c27be63e 100644
|
index 2b5402b009..2c27be63ea 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
@@ -401,6 +401,12 @@ public class PaperWorldConfig {
|
@@ -401,6 +401,12 @@ public class PaperWorldConfig {
|
||||||
@ -22,7 +22,7 @@ index 2b5402b00..2c27be63e 100644
|
|||||||
private void armorStandTick() {
|
private void armorStandTick() {
|
||||||
this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick);
|
this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick);
|
||||||
diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java
|
diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java
|
||||||
index 44e00339f..b4616f259 100644
|
index 44e00339f2..b4616f259e 100644
|
||||||
--- a/src/main/java/net/minecraft/server/BlockFluids.java
|
--- a/src/main/java/net/minecraft/server/BlockFluids.java
|
||||||
+++ b/src/main/java/net/minecraft/server/BlockFluids.java
|
+++ b/src/main/java/net/minecraft/server/BlockFluids.java
|
||||||
@@ -70,11 +70,27 @@ public class BlockFluids extends Block implements IFluidSource {
|
@@ -70,11 +70,27 @@ public class BlockFluids extends Block implements IFluidSource {
|
@ -1,4 +1,4 @@
|
|||||||
From da428268d2e5594cecb0cbf38d51f6c3021d6af0 Mon Sep 17 00:00:00 2001
|
From 61f14ee6694a89bbd6a0888d95535aa7ade9d667 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sun, 26 Aug 2018 20:49:50 -0400
|
Date: Sun, 26 Aug 2018 20:49:50 -0400
|
||||||
Subject: [PATCH] Optimize RegistryMaterials
|
Subject: [PATCH] Optimize RegistryMaterials
|
||||||
@ -8,7 +8,7 @@ Use larger initial sizes to increase bucket capacity on the BiMap
|
|||||||
BiMap.get was seen to be using a good bit of CPU time.
|
BiMap.get was seen to be using a good bit of CPU time.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/RegistryMaterials.java b/src/main/java/net/minecraft/server/RegistryMaterials.java
|
diff --git a/src/main/java/net/minecraft/server/RegistryMaterials.java b/src/main/java/net/minecraft/server/RegistryMaterials.java
|
||||||
index f291e05b2..fed38e6ef 100644
|
index f291e05b26..fed38e6ef0 100644
|
||||||
--- a/src/main/java/net/minecraft/server/RegistryMaterials.java
|
--- a/src/main/java/net/minecraft/server/RegistryMaterials.java
|
||||||
+++ b/src/main/java/net/minecraft/server/RegistryMaterials.java
|
+++ b/src/main/java/net/minecraft/server/RegistryMaterials.java
|
||||||
@@ -16,9 +16,9 @@ import org.apache.logging.log4j.Logger;
|
@@ -16,9 +16,9 @@ import org.apache.logging.log4j.Logger;
|
@ -1,11 +1,11 @@
|
|||||||
From 94bfe89904dde5bfaadb0e759c2a590a629106fd Mon Sep 17 00:00:00 2001
|
From 08def75c3cf04fd95baa56cb28f25c27f7005909 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Sat, 25 Aug 2018 19:56:51 -0500
|
Date: Sat, 25 Aug 2018 19:56:51 -0500
|
||||||
Subject: [PATCH] Add PhantomPreSpawnEvent
|
Subject: [PATCH] Add PhantomPreSpawnEvent
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
|
diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
|
||||||
index e5ed5a3dc..e5d032d02 100644
|
index e5ed5a3dcc..e5d032d02b 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityPhantom.java
|
--- a/src/main/java/net/minecraft/server/EntityPhantom.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
|
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
|
||||||
@@ -129,6 +129,11 @@ public class EntityPhantom extends EntityFlying implements IMonster {
|
@@ -129,6 +129,11 @@ public class EntityPhantom extends EntityFlying implements IMonster {
|
||||||
@ -48,7 +48,7 @@ index e5ed5a3dc..e5d032d02 100644
|
|||||||
|
|
||||||
private final PathfinderTargetCondition b;
|
private final PathfinderTargetCondition b;
|
||||||
diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
|
diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
|
||||||
index 9f64d81c6..1818e7c38 100644
|
index 9f64d81c64..1818e7c384 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
|
--- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
|
+++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
|
||||||
@@ -50,8 +50,17 @@ public class MobSpawnerPhantom {
|
@@ -50,8 +50,17 @@ public class MobSpawnerPhantom {
|
||||||
@ -71,7 +71,7 @@ index 9f64d81c6..1818e7c38 100644
|
|||||||
groupdataentity = entityphantom.prepare(worldserver, difficultydamagescaler, EnumMobSpawn.NATURAL, groupdataentity, (NBTTagCompound) null);
|
groupdataentity = entityphantom.prepare(worldserver, difficultydamagescaler, EnumMobSpawn.NATURAL, groupdataentity, (NBTTagCompound) null);
|
||||||
worldserver.addEntity(entityphantom, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit
|
worldserver.addEntity(entityphantom, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
|
||||||
index 9f9ee9239..2b9731369 100644
|
index 9f9ee92390..2b97313694 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
|
||||||
@@ -35,4 +35,10 @@ public class CraftPhantom extends CraftFlying implements Phantom {
|
@@ -35,4 +35,10 @@ public class CraftPhantom extends CraftFlying implements Phantom {
|
@ -1,11 +1,11 @@
|
|||||||
From 8dd46e3c15d3dafdeda826cfa52bc05e2772df74 Mon Sep 17 00:00:00 2001
|
From 7f389a7f31a6f26910ff135b6c4cf67b376a36bb Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Fri, 24 Aug 2018 11:50:26 -0500
|
Date: Fri, 24 Aug 2018 11:50:26 -0500
|
||||||
Subject: [PATCH] Add More Creeper API
|
Subject: [PATCH] Add More Creeper API
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
|
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
|
||||||
index 29569805c..0c2c3c730 100644
|
index 29569805cb..0c2c3c7308 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
|
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
|
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
|
||||||
@@ -13,7 +13,7 @@ public class EntityCreeper extends EntityMonster {
|
@@ -13,7 +13,7 @@ public class EntityCreeper extends EntityMonster {
|
||||||
@ -47,7 +47,7 @@ index 29569805c..0c2c3c730 100644
|
|||||||
|
|
||||||
public boolean canCauseHeadDrop() {
|
public boolean canCauseHeadDrop() {
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
|
||||||
index 796ee9e40..2d38823c5 100644
|
index 796ee9e40d..2d38823c57 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
|
||||||
@@ -78,4 +78,22 @@ public class CraftCreeper extends CraftMonster implements Creeper {
|
@@ -78,4 +78,22 @@ public class CraftCreeper extends CraftMonster implements Creeper {
|
@ -1,11 +1,11 @@
|
|||||||
From a93fab3b32dae7412e4c3e7806f964c636d31820 Mon Sep 17 00:00:00 2001
|
From 6a2062ad2420c5f42f60a08a82abfab2d379d9fa Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Tue, 28 Aug 2018 23:04:15 -0400
|
Date: Tue, 28 Aug 2018 23:04:15 -0400
|
||||||
Subject: [PATCH] Inventory#removeItemAnySlot
|
Subject: [PATCH] Inventory#removeItemAnySlot
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
||||||
index 7e0a20d1d..c3516de7f 100644
|
index 7e0a20d1d7..c3516de7f4 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
||||||
@@ -223,10 +223,16 @@ public class CraftInventory implements Inventory {
|
@@ -223,10 +223,16 @@ public class CraftInventory implements Inventory {
|
@ -1,4 +1,4 @@
|
|||||||
From 6a510bdc5a0312814acd7e8781d89d38a2b00f40 Mon Sep 17 00:00:00 2001
|
From 3169b20390f624a3819d11623cf93f7c37327a49 Mon Sep 17 00:00:00 2001
|
||||||
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
||||||
Date: Sun, 2 Sep 2018 19:34:33 -0700
|
Date: Sun, 2 Sep 2018 19:34:33 -0700
|
||||||
Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
|
Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
index 9601d412a..ca41b6d6b 100644
|
index 9601d412ab..ca41b6d6ba 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
@@ -478,7 +478,7 @@ public class CraftWorld implements World {
|
@@ -478,7 +478,7 @@ public class CraftWorld implements World {
|
@ -1,11 +1,11 @@
|
|||||||
From 6382bfe981164038843888357877fb72abddcace Mon Sep 17 00:00:00 2001
|
From 4070628e412e583070ec7f89a113ee798abcb66c Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Mon, 3 Sep 2018 18:20:03 -0500
|
Date: Mon, 3 Sep 2018 18:20:03 -0500
|
||||||
Subject: [PATCH] Add ray tracing methods to LivingEntity
|
Subject: [PATCH] Add ray tracing methods to LivingEntity
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
index 6334d3dea..ef24896c0 100644
|
index 6334d3dea4..ef24896c0f 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
@@ -3170,6 +3170,23 @@ public abstract class EntityLiving extends Entity {
|
@@ -3170,6 +3170,23 @@ public abstract class EntityLiving extends Entity {
|
||||||
@ -33,7 +33,7 @@ index 6334d3dea..ef24896c0 100644
|
|||||||
|
|
||||||
public int getShieldBlockingDelay() {
|
public int getShieldBlockingDelay() {
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||||
index 00fae6840..4233ffe65 100644
|
index 00fae68408..4233ffe654 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||||
@@ -179,6 +179,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
@@ -179,6 +179,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
@ -1,11 +1,11 @@
|
|||||||
From 29dac3a1b697140395f243de7a281f933480d558 Mon Sep 17 00:00:00 2001
|
From 57ebaabf637c0aca1bd24a3c908e4a78452226ed Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Tue, 4 Sep 2018 15:02:00 -0500
|
Date: Tue, 4 Sep 2018 15:02:00 -0500
|
||||||
Subject: [PATCH] Expose attack cooldown methods for Player
|
Subject: [PATCH] Expose attack cooldown methods for Player
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||||
index d1a7a873b..2f614dfb6 100644
|
index d1a7a873b9..2f614dfb6b 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||||
@@ -2003,14 +2003,17 @@ public abstract class EntityHuman extends EntityLiving {
|
@@ -2003,14 +2003,17 @@ public abstract class EntityHuman extends EntityLiving {
|
||||||
@ -27,7 +27,7 @@ index d1a7a873b..2f614dfb6 100644
|
|||||||
this.aD = 0;
|
this.aD = 0;
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
index ba60ece45..0386452a8 100644
|
index ba60ece457..0386452a8d 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
@@ -1908,6 +1908,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
@@ -1908,6 +1908,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
@ -1,4 +1,4 @@
|
|||||||
From bce84891d0934ab524e6f577621772faffc88e31 Mon Sep 17 00:00:00 2001
|
From 808f26b2ce12112b0dedd5a06f2f4d58bebaedef Mon Sep 17 00:00:00 2001
|
||||||
From: Phoenix616 <mail@moep.tv>
|
From: Phoenix616 <mail@moep.tv>
|
||||||
Date: Tue, 21 Aug 2018 01:39:35 +0100
|
Date: Tue, 21 Aug 2018 01:39:35 +0100
|
||||||
Subject: [PATCH] Improve death events
|
Subject: [PATCH] Improve death events
|
||||||
@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
|
|||||||
internal code.
|
internal code.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java
|
diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java
|
||||||
index 20db76abd..a148cd437 100644
|
index 20db76abd7..a148cd437c 100644
|
||||||
--- a/src/main/java/net/minecraft/server/CombatTracker.java
|
--- a/src/main/java/net/minecraft/server/CombatTracker.java
|
||||||
+++ b/src/main/java/net/minecraft/server/CombatTracker.java
|
+++ b/src/main/java/net/minecraft/server/CombatTracker.java
|
||||||
@@ -175,6 +175,7 @@ public class CombatTracker {
|
@@ -175,6 +175,7 @@ public class CombatTracker {
|
||||||
@ -27,7 +27,7 @@ index 20db76abd..a148cd437 100644
|
|||||||
int i = this.f ? 300 : 100;
|
int i = this.f ? 300 : 100;
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||||
index e1c793aad..b060a74a1 100644
|
index e1c793aad5..b060a74a1e 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||||
@@ -1463,6 +1463,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@@ -1463,6 +1463,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||||
@ -47,7 +47,7 @@ index e1c793aad..b060a74a1 100644
|
|||||||
|
|
||||||
protected void i(double d0, double d1, double d2) {
|
protected void i(double d0, double d1, double d2) {
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||||
index 5c35909eb..19ba4e059 100644
|
index 5c35909eb2..19ba4e059f 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
|
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||||
@@ -675,7 +675,8 @@ public class EntityArmorStand extends EntityLiving {
|
@@ -675,7 +675,8 @@ public class EntityArmorStand extends EntityLiving {
|
||||||
@ -61,7 +61,7 @@ index 5c35909eb..19ba4e059 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
|
diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
|
||||||
index 87091d804..77643413f 100644
|
index 87091d8045..77643413f3 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityFox.java
|
--- a/src/main/java/net/minecraft/server/EntityFox.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityFox.java
|
+++ b/src/main/java/net/minecraft/server/EntityFox.java
|
||||||
@@ -597,15 +597,25 @@ public class EntityFox extends EntityAnimal {
|
@@ -597,15 +597,25 @@ public class EntityFox extends EntityAnimal {
|
||||||
@ -94,7 +94,7 @@ index 87091d804..77643413f 100644
|
|||||||
|
|
||||||
public static boolean a(EntityFox entityfox, EntityLiving entityliving) {
|
public static boolean a(EntityFox entityfox, EntityLiving entityliving) {
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
index ef24896c0..2631e9a4b 100644
|
index ef24896c0f..2631e9a4ba 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
@@ -85,7 +85,7 @@ public abstract class EntityLiving extends Entity {
|
@@ -85,7 +85,7 @@ public abstract class EntityLiving extends Entity {
|
||||||
@ -249,7 +249,7 @@ index ef24896c0..2631e9a4b 100644
|
|||||||
return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
|
return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
index d46ddba34..0f3be967e 100644
|
index d46ddba341..0f3be967e5 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
@@ -75,6 +75,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
@@ -75,6 +75,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||||
@ -300,7 +300,7 @@ index d46ddba34..0f3be967e 100644
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
|
||||||
index 73cb64e09..9f317ff2e 100644
|
index 73cb64e09d..9f317ff2e8 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
|
||||||
@@ -806,6 +806,22 @@ public enum CraftSound {
|
@@ -806,6 +806,22 @@ public enum CraftSound {
|
||||||
@ -327,7 +327,7 @@ index 73cb64e09..9f317ff2e 100644
|
|||||||
this.minecraftKey = minecraftKey;
|
this.minecraftKey = minecraftKey;
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
index 0386452a8..deacc2187 100644
|
index 0386452a8d..deacc21873 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
@@ -1712,7 +1712,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
@@ -1712,7 +1712,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||||
@ -348,7 +348,7 @@ index 0386452a8..deacc2187 100644
|
|||||||
|
|
||||||
public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
|
public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||||
index 9380b4953..781bf2b42 100644
|
index 9380b4953f..781bf2b42f 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||||
@@ -720,9 +720,16 @@ public class CraftEventFactory {
|
@@ -720,9 +720,16 @@ public class CraftEventFactory {
|
@ -1,11 +1,11 @@
|
|||||||
From 7e6b225f5a6ab33236a0fa8e938cdac876bc64bd Mon Sep 17 00:00:00 2001
|
From 76e46a384be86466049b90d85aeff048a6b91794 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Sat, 8 Sep 2018 18:43:31 -0500
|
Date: Sat, 8 Sep 2018 18:43:31 -0500
|
||||||
Subject: [PATCH] Allow chests to be placed with NBT data
|
Subject: [PATCH] Allow chests to be placed with NBT data
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
|
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
|
||||||
index 2d83c9e79..dec589463 100644
|
index 2d83c9e79c..dec5894637 100644
|
||||||
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
||||||
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
||||||
@@ -235,6 +235,7 @@ public final class ItemStack {
|
@@ -235,6 +235,7 @@ public final class ItemStack {
|
||||||
@ -17,7 +17,7 @@ index 2d83c9e79..dec589463 100644
|
|||||||
for (BlockState blockstate : blocks) {
|
for (BlockState blockstate : blocks) {
|
||||||
blockstate.update(true, false);
|
blockstate.update(true, false);
|
||||||
diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
|
diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
|
||||||
index d606e2e4f..f9f9183da 100644
|
index d606e2e4fd..f9f9183daa 100644
|
||||||
--- a/src/main/java/net/minecraft/server/TileEntityChest.java
|
--- a/src/main/java/net/minecraft/server/TileEntityChest.java
|
||||||
+++ b/src/main/java/net/minecraft/server/TileEntityChest.java
|
+++ b/src/main/java/net/minecraft/server/TileEntityChest.java
|
||||||
@@ -308,7 +308,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic
|
@@ -308,7 +308,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic
|
@ -1,4 +1,4 @@
|
|||||||
From dcd722dbbe2dc22a1cba041ae490d1da46d84429 Mon Sep 17 00:00:00 2001
|
From ea30d1b969577bd6f08afb4541f442ec4732e353 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sun, 9 Sep 2018 13:30:00 -0400
|
Date: Sun, 9 Sep 2018 13:30:00 -0400
|
||||||
Subject: [PATCH] Mob Pathfinding API
|
Subject: [PATCH] Mob Pathfinding API
|
||||||
@ -7,7 +7,7 @@ Implements Pathfinding API for mobs
|
|||||||
|
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
|
diff --git a/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..f68a07cb9
|
index 0000000000..f68a07cb96
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
|
+++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
|
||||||
@@ -0,0 +1,111 @@
|
@@ -0,0 +1,111 @@
|
||||||
@ -123,7 +123,7 @@ index 000000000..f68a07cb9
|
|||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
|
diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
|
||||||
index 6cc142383..1bf7ead71 100644
|
index 6cc1423837..1bf7ead714 100644
|
||||||
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
|
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
|
||||||
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
|
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
|
||||||
@@ -69,7 +69,7 @@ public abstract class NavigationAbstract {
|
@@ -69,7 +69,7 @@ public abstract class NavigationAbstract {
|
||||||
@ -170,7 +170,7 @@ index 6cc142383..1bf7ead71 100644
|
|||||||
this.pathfindFailures = 0; this.lastFailure = 0; // Paper - Pathfinding optimizations
|
this.pathfindFailures = 0; this.lastFailure = 0; // Paper - Pathfinding optimizations
|
||||||
this.c = null;
|
this.c = null;
|
||||||
diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java
|
diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java
|
||||||
index f1d94420c..5fdb60180 100644
|
index f1d94420c8..5fdb601801 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PathEntity.java
|
--- a/src/main/java/net/minecraft/server/PathEntity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PathEntity.java
|
+++ b/src/main/java/net/minecraft/server/PathEntity.java
|
||||||
@@ -5,11 +5,12 @@ import javax.annotation.Nullable;
|
@@ -5,11 +5,12 @@ import javax.annotation.Nullable;
|
||||||
@ -208,7 +208,7 @@ index f1d94420c..5fdb60180 100644
|
|||||||
|
|
||||||
return new Vec3D((double) pathpoint.a, (double) pathpoint.b, (double) pathpoint.c);
|
return new Vec3D((double) pathpoint.a, (double) pathpoint.b, (double) pathpoint.c);
|
||||||
diff --git a/src/main/java/net/minecraft/server/PathPoint.java b/src/main/java/net/minecraft/server/PathPoint.java
|
diff --git a/src/main/java/net/minecraft/server/PathPoint.java b/src/main/java/net/minecraft/server/PathPoint.java
|
||||||
index 955152ef4..4e2cef8f6 100644
|
index 955152ef4e..4e2cef8f67 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PathPoint.java
|
--- a/src/main/java/net/minecraft/server/PathPoint.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PathPoint.java
|
+++ b/src/main/java/net/minecraft/server/PathPoint.java
|
||||||
@@ -2,9 +2,9 @@ package net.minecraft.server;
|
@@ -2,9 +2,9 @@ package net.minecraft.server;
|
||||||
@ -225,7 +225,7 @@ index 955152ef4..4e2cef8f6 100644
|
|||||||
public int d = -1;
|
public int d = -1;
|
||||||
public float e;
|
public float e;
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
|
||||||
index 5bf1cd06f..53c2d154e 100644
|
index 5bf1cd06fa..53c2d154ed 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
|
||||||
@@ -12,8 +12,11 @@ import org.bukkit.loot.LootTable;
|
@@ -12,8 +12,11 @@ import org.bukkit.loot.LootTable;
|
@ -1,11 +1,11 @@
|
|||||||
From cb9bc772781cdbbbe129929c0054df90d7ecbc34 Mon Sep 17 00:00:00 2001
|
From 2cededad82edc0d12c8b78ddd01dde479630f6ad Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Mon, 10 Sep 2018 23:36:16 -0400
|
Date: Mon, 10 Sep 2018 23:36:16 -0400
|
||||||
Subject: [PATCH] Prevent chunk loading from Fluid Flowing
|
Subject: [PATCH] Prevent chunk loading from Fluid Flowing
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
|
diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
|
||||||
index c76fa0b4b..5f1514360 100644
|
index c76fa0b4bf..5f15143603 100644
|
||||||
--- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java
|
--- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java
|
||||||
+++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
|
+++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
|
||||||
@@ -178,7 +178,8 @@ public abstract class FluidTypeFlowing extends FluidType {
|
@@ -178,7 +178,8 @@ public abstract class FluidTypeFlowing extends FluidType {
|
@ -1,11 +1,11 @@
|
|||||||
From 9150274ca0d7bca90eb19dda095074435328e565 Mon Sep 17 00:00:00 2001
|
From bcab389ca1ab07d529fc53068b3a5fd1bb620378 Mon Sep 17 00:00:00 2001
|
||||||
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
|
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
|
||||||
Date: Wed, 12 Sep 2018 18:53:55 +0300
|
Date: Wed, 12 Sep 2018 18:53:55 +0300
|
||||||
Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values
|
Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/ArgumentBlock.java b/src/main/java/net/minecraft/server/ArgumentBlock.java
|
diff --git a/src/main/java/net/minecraft/server/ArgumentBlock.java b/src/main/java/net/minecraft/server/ArgumentBlock.java
|
||||||
index 3a215dea4..ea93452e6 100644
|
index 3a215dea43..ea93452e6d 100644
|
||||||
--- a/src/main/java/net/minecraft/server/ArgumentBlock.java
|
--- a/src/main/java/net/minecraft/server/ArgumentBlock.java
|
||||||
+++ b/src/main/java/net/minecraft/server/ArgumentBlock.java
|
+++ b/src/main/java/net/minecraft/server/ArgumentBlock.java
|
||||||
@@ -43,7 +43,7 @@ public class ArgumentBlock {
|
@@ -43,7 +43,7 @@ public class ArgumentBlock {
|
||||||
@ -32,7 +32,7 @@ index 3a215dea4..ea93452e6 100644
|
|||||||
this.s = this::l;
|
this.s = this::l;
|
||||||
if (this.i.canRead() && this.i.peek() == '#') {
|
if (this.i.canRead() && this.i.peek() == '#') {
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||||
index 159037fc3..9dcf2d20f 100644
|
index 159037fc3e..9dcf2d20f2 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||||
@@ -86,6 +86,12 @@ import org.bukkit.persistence.PersistentDataContainer;
|
@@ -86,6 +86,12 @@ import org.bukkit.persistence.PersistentDataContainer;
|
@ -1,11 +1,11 @@
|
|||||||
From db28398df075be84961aecfbc0101c8a75bbb8e9 Mon Sep 17 00:00:00 2001
|
From d2a70df6e26a1fd7dee1650cc5448d30b828b73a Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Mon, 10 Sep 2018 23:56:36 -0400
|
Date: Mon, 10 Sep 2018 23:56:36 -0400
|
||||||
Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks
|
Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
|
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
|
||||||
index ce9318c57..541d97344 100644
|
index ce9318c575..541d97344e 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
|
--- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
|
+++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
|
||||||
@@ -12,11 +12,13 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
|
@@ -12,11 +12,13 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
|
||||||
@ -53,7 +53,7 @@ index ce9318c57..541d97344 100644
|
|||||||
return block == this.g && iworldreader.getType(blockposition.up()).isAir() && iworldreader.getType(blockposition.up(2)).isAir();
|
return block == this.g && iworldreader.getType(blockposition.up()).isAir() && iworldreader.getType(blockposition.up(2)).isAir();
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
|
diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
|
||||||
index b286934aa..c7e25e2be 100644
|
index b286934aa8..c7e25e2be8 100644
|
||||||
--- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java
|
--- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java
|
||||||
+++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
|
+++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
|
||||||
@@ -93,6 +93,7 @@ public class RandomPositionGenerator {
|
@@ -93,6 +93,7 @@ public class RandomPositionGenerator {
|
||||||
@ -74,7 +74,7 @@ index b286934aa..c7e25e2be 100644
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index 31ffc57c9..830780b49 100644
|
index 8bb2e1bf0f..5220ea0994 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -647,6 +647,16 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
@@ -647,6 +647,16 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
@ -1,4 +1,4 @@
|
|||||||
From ca76c23078d05476c1e3ebf58fedf94349e791df Mon Sep 17 00:00:00 2001
|
From 7a9fa948ba5ff3fbe51bf1ec22f5f06a3ea0c091 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Wed, 12 Sep 2018 21:12:57 -0400
|
Date: Wed, 12 Sep 2018 21:12:57 -0400
|
||||||
Subject: [PATCH] Prevent mob spawning from loading/generating chunks
|
Subject: [PATCH] Prevent mob spawning from loading/generating chunks
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks
|
|||||||
also prevents if out of world border bounds
|
also prevents if out of world border bounds
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||||
index 14e2f3ca7..5824cbba6 100644
|
index 14e2f3ca71..5824cbba67 100644
|
||||||
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
|
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||||
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||||
@@ -25,9 +25,9 @@ public final class SpawnerCreature {
|
@@ -25,9 +25,9 @@ public final class SpawnerCreature {
|
@ -1,4 +1,4 @@
|
|||||||
From 1e47f305ac479df81f14a237fd06207f33e2cb40 Mon Sep 17 00:00:00 2001
|
From 531922c361738780d5ad940b3417d385268439f3 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Wed, 12 Sep 2018 21:47:01 -0400
|
Date: Wed, 12 Sep 2018 21:47:01 -0400
|
||||||
Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
|
Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
|
|||||||
Uses an EnumMap as well as a Set paired List for O(1) contains calls.
|
Uses an EnumMap as well as a Set paired List for O(1) contains calls.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
|
diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
|
||||||
index 9a839d654..72eb669c5 100644
|
index 9a839d6540..72eb669c50 100644
|
||||||
--- a/src/main/java/net/minecraft/server/BiomeBase.java
|
--- a/src/main/java/net/minecraft/server/BiomeBase.java
|
||||||
+++ b/src/main/java/net/minecraft/server/BiomeBase.java
|
+++ b/src/main/java/net/minecraft/server/BiomeBase.java
|
||||||
@@ -38,7 +38,7 @@ public abstract class BiomeBase {
|
@@ -38,7 +38,7 @@ public abstract class BiomeBase {
|
@ -1,4 +1,4 @@
|
|||||||
From 27520fa921bec839d7426ff7a8ebeec05cf974c3 Mon Sep 17 00:00:00 2001
|
From 88622e1383001ad29592cc4e6fd9dba28f849c7b Mon Sep 17 00:00:00 2001
|
||||||
From: Tassu <git@tassu.me>
|
From: Tassu <git@tassu.me>
|
||||||
Date: Thu, 13 Sep 2018 08:45:21 +0300
|
Date: Thu, 13 Sep 2018 08:45:21 +0300
|
||||||
Subject: [PATCH] Implement furnace cook speed multiplier API
|
Subject: [PATCH] Implement furnace cook speed multiplier API
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API
|
|||||||
Signed-off-by: Tassu <git@tassu.me>
|
Signed-off-by: Tassu <git@tassu.me>
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
|
diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
|
||||||
index be16fe9a9..b9f3a952e 100644
|
index be16fe9a9e..b9f3a952e8 100644
|
||||||
--- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
|
--- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
|
||||||
+++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
|
+++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
|
||||||
@@ -8,6 +8,7 @@ import java.util.Map;
|
@@ -8,6 +8,7 @@ import java.util.Map;
|
||||||
@ -57,7 +57,7 @@ index be16fe9a9..b9f3a952e 100644
|
|||||||
this.cookTimeTotal = this.getRecipeCookingTime();
|
this.cookTimeTotal = this.getRecipeCookingTime();
|
||||||
this.burn(irecipe);
|
this.burn(irecipe);
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
|
||||||
index 9cc67915c..1ce10ea04 100644
|
index 9cc67915ca..1ce10ea049 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
|
||||||
@@ -63,4 +63,18 @@ public class CraftFurnace<T extends TileEntityFurnace> extends CraftContainer<T>
|
@@ -63,4 +63,18 @@ public class CraftFurnace<T extends TileEntityFurnace> extends CraftContainer<T>
|
@ -1,4 +1,4 @@
|
|||||||
From 8fa7e6f90ba36f6a7533c57bb79dd28abf31bd0c Mon Sep 17 00:00:00 2001
|
From 29e65558defe03fa9e5b995a8cbad3a1db22a687 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Mon, 17 Sep 2018 23:05:31 -0400
|
Date: Mon, 17 Sep 2018 23:05:31 -0400
|
||||||
Subject: [PATCH] Support Overriding World Seeds
|
Subject: [PATCH] Support Overriding World Seeds
|
||||||
@ -15,7 +15,7 @@ This seed will end up being saved to the world data file, so it is
|
|||||||
a permanent change in that it won't go back if you remove it from paper.yml
|
a permanent change in that it won't go back if you remove it from paper.yml
|
||||||
|
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
index 833659bbb..ffb18902f 100644
|
index 833659bbb2..ffb18902ff 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
@@ -11,6 +11,7 @@ import java.lang.reflect.Modifier;
|
@@ -11,6 +11,7 @@ import java.lang.reflect.Modifier;
|
||||||
@ -59,7 +59,7 @@ index 833659bbb..ffb18902f 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
index 6a3776091..0209330ad 100644
|
index 6a3776091e..0209330ad4 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -363,7 +363,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
@@ -363,7 +363,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||||
@ -72,7 +72,7 @@ index 6a3776091..0209330ad 100644
|
|||||||
|
|
||||||
if (j == 0) {
|
if (j == 0) {
|
||||||
diff --git a/src/main/java/net/minecraft/server/WorldData.java b/src/main/java/net/minecraft/server/WorldData.java
|
diff --git a/src/main/java/net/minecraft/server/WorldData.java b/src/main/java/net/minecraft/server/WorldData.java
|
||||||
index 9ecd412ae..eb1464983 100644
|
index 9ecd412ae3..eb14649830 100644
|
||||||
--- a/src/main/java/net/minecraft/server/WorldData.java
|
--- a/src/main/java/net/minecraft/server/WorldData.java
|
||||||
+++ b/src/main/java/net/minecraft/server/WorldData.java
|
+++ b/src/main/java/net/minecraft/server/WorldData.java
|
||||||
@@ -116,7 +116,7 @@ public class WorldData {
|
@@ -116,7 +116,7 @@ public class WorldData {
|
||||||
@ -85,7 +85,7 @@ index 9ecd412ae..eb1464983 100644
|
|||||||
String s = nbttagcompound.getString("generatorName");
|
String s = nbttagcompound.getString("generatorName");
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
index 770dbf605..2e03556f2 100644
|
index 770dbf6052..2e03556f2b 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
@@ -985,7 +985,7 @@ public final class CraftServer implements Server {
|
@@ -985,7 +985,7 @@ public final class CraftServer implements Server {
|
@ -1,4 +1,4 @@
|
|||||||
From 10c1e39559a9a997f292adef016965d76262dfd2 Mon Sep 17 00:00:00 2001
|
From fe9c34162b8ad9499acf895ef24bae9ea09cced2 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Mon, 17 Sep 2018 23:37:31 -0400
|
Date: Mon, 17 Sep 2018 23:37:31 -0400
|
||||||
Subject: [PATCH] Optimize Server World Map
|
Subject: [PATCH] Optimize Server World Map
|
||||||
@ -21,7 +21,7 @@ known NMS used methods, but we can add more if naughty plugins are found later.
|
|||||||
|
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldMap.java b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldMap.java b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..6bb2f98b4
|
index 0000000000..6bb2f98b45
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
|
||||||
@@ -0,0 +1,191 @@
|
@@ -0,0 +1,191 @@
|
||||||
@ -217,7 +217,7 @@ index 000000000..6bb2f98b4
|
|||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
index 0209330ad..0a02dece6 100644
|
index 0209330ad4..0a02dece68 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -78,7 +78,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
@@ -78,7 +78,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
@ -1,4 +1,4 @@
|
|||||||
From 2e24ac06e3a238982ad6c4f8a997c4b7cfccf3a5 Mon Sep 17 00:00:00 2001
|
From d5b65eb227e255c2ec85ed6bdcb4bd04a6c7f4d4 Mon Sep 17 00:00:00 2001
|
||||||
From: Phoenix616 <mail@moep.tv>
|
From: Phoenix616 <mail@moep.tv>
|
||||||
Date: Tue, 18 Sep 2018 23:53:23 +0100
|
Date: Tue, 18 Sep 2018 23:53:23 +0100
|
||||||
Subject: [PATCH] PreSpawnerSpawnEvent
|
Subject: [PATCH] PreSpawnerSpawnEvent
|
||||||
@ -9,7 +9,7 @@ SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for
|
|||||||
spawners.
|
spawners.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
||||||
index 55764deec..dbb8098d6 100644
|
index 55764deec4..dbb8098d6c 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
||||||
@@ -108,11 +108,11 @@ public abstract class MobSpawnerAbstract {
|
@@ -108,11 +108,11 @@ public abstract class MobSpawnerAbstract {
|
@ -1,4 +1,4 @@
|
|||||||
From 7002617ae09ca1a57ca7a72648b528047e78b358 Mon Sep 17 00:00:00 2001
|
From 091bf5c1ff4b65cdb0a60a83545e5f42724c0f46 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Sat, 22 Sep 2018 15:56:59 -0400
|
Date: Sat, 22 Sep 2018 15:56:59 -0400
|
||||||
Subject: [PATCH] Catch JsonParseException in Entity and TE names
|
Subject: [PATCH] Catch JsonParseException in Entity and TE names
|
||||||
@ -13,7 +13,7 @@ Shulkers) may need to be changed in order for it to re-save properly
|
|||||||
No more crashing though.
|
No more crashing though.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
|
diff --git a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
|
||||||
index 4b7aefb7a..9e568d5d1 100644
|
index 4b7aefb7a7..9e568d5d15 100644
|
||||||
--- a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
|
--- a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
|
||||||
+++ b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
|
+++ b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
|
||||||
@@ -56,7 +56,7 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener {
|
@@ -56,7 +56,7 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener {
|
||||||
@ -26,7 +26,7 @@ index 4b7aefb7a..9e568d5d1 100644
|
|||||||
|
|
||||||
if (nbttagcompound.hasKeyOfType("TrackOutput", 1)) {
|
if (nbttagcompound.hasKeyOfType("TrackOutput", 1)) {
|
||||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||||
index b060a74a1..b1cf9b85f 100644
|
index b060a74a1e..b1cf9b85fa 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||||
@@ -1647,7 +1647,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@@ -1647,7 +1647,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||||
@ -39,7 +39,7 @@ index b060a74a1..b1cf9b85f 100644
|
|||||||
|
|
||||||
this.setCustomNameVisible(nbttagcompound.getBoolean("CustomNameVisible"));
|
this.setCustomNameVisible(nbttagcompound.getBoolean("CustomNameVisible"));
|
||||||
diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
|
diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
|
||||||
index 6d278a0da..ec3732193 100644
|
index 6d278a0da5..ec3732193f 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MCUtil.java
|
--- a/src/main/java/net/minecraft/server/MCUtil.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MCUtil.java
|
+++ b/src/main/java/net/minecraft/server/MCUtil.java
|
||||||
@@ -339,4 +339,19 @@ public final class MCUtil {
|
@@ -339,4 +339,19 @@ public final class MCUtil {
|
||||||
@ -63,7 +63,7 @@ index 6d278a0da..ec3732193 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/TileEntityBanner.java b/src/main/java/net/minecraft/server/TileEntityBanner.java
|
diff --git a/src/main/java/net/minecraft/server/TileEntityBanner.java b/src/main/java/net/minecraft/server/TileEntityBanner.java
|
||||||
index 1f26d8a02..12264c4d0 100644
|
index 1f26d8a022..12264c4d03 100644
|
||||||
--- a/src/main/java/net/minecraft/server/TileEntityBanner.java
|
--- a/src/main/java/net/minecraft/server/TileEntityBanner.java
|
||||||
+++ b/src/main/java/net/minecraft/server/TileEntityBanner.java
|
+++ b/src/main/java/net/minecraft/server/TileEntityBanner.java
|
||||||
@@ -57,7 +57,7 @@ public class TileEntityBanner extends TileEntity implements INamableTileEntity {
|
@@ -57,7 +57,7 @@ public class TileEntityBanner extends TileEntity implements INamableTileEntity {
|
||||||
@ -76,7 +76,7 @@ index 1f26d8a02..12264c4d0 100644
|
|||||||
|
|
||||||
if (this.hasWorld()) {
|
if (this.hasWorld()) {
|
||||||
diff --git a/src/main/java/net/minecraft/server/TileEntityContainer.java b/src/main/java/net/minecraft/server/TileEntityContainer.java
|
diff --git a/src/main/java/net/minecraft/server/TileEntityContainer.java b/src/main/java/net/minecraft/server/TileEntityContainer.java
|
||||||
index 3590b4e31..ea7d5a430 100644
|
index 3590b4e317..ea7d5a430a 100644
|
||||||
--- a/src/main/java/net/minecraft/server/TileEntityContainer.java
|
--- a/src/main/java/net/minecraft/server/TileEntityContainer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/TileEntityContainer.java
|
+++ b/src/main/java/net/minecraft/server/TileEntityContainer.java
|
||||||
@@ -17,7 +17,7 @@ public abstract class TileEntityContainer extends TileEntity implements IInvento
|
@@ -17,7 +17,7 @@ public abstract class TileEntityContainer extends TileEntity implements IInvento
|
@ -1,4 +1,4 @@
|
|||||||
From 2b69d7f4b9412f29bb5dd3f7e9e2f9c4c5933a9d Mon Sep 17 00:00:00 2001
|
From 5e1bf74c8276c66d67df69c4482c4a11727b0c7f Mon Sep 17 00:00:00 2001
|
||||||
From: Brokkonaut <hannos17@gmx.de>
|
From: Brokkonaut <hannos17@gmx.de>
|
||||||
Date: Tue, 25 Sep 2018 06:53:43 +0200
|
Date: Tue, 25 Sep 2018 06:53:43 +0200
|
||||||
Subject: [PATCH] Avoid dimension id collisions
|
Subject: [PATCH] Avoid dimension id collisions
|
||||||
@ -8,7 +8,7 @@ we would reuse an existing dimension id, if some other dimension was
|
|||||||
unloaded before.
|
unloaded before.
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
index 2e03556f2..467583f1d 100644
|
index 2e03556f2b..467583f1dc 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
@@ -971,7 +971,7 @@ public final class CraftServer implements Server {
|
@@ -971,7 +971,7 @@ public final class CraftServer implements Server {
|
@ -1,11 +1,11 @@
|
|||||||
From f833510f284d253f645486538ee2048dfe2bd5c4 Mon Sep 17 00:00:00 2001
|
From ec2beef52dccd22c1ade05df0dd2f9e31ab01dcf Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Sun, 23 Sep 2018 20:59:53 -0500
|
Date: Sun, 23 Sep 2018 20:59:53 -0500
|
||||||
Subject: [PATCH] Honor EntityAgeable.ageLock
|
Subject: [PATCH] Honor EntityAgeable.ageLock
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
|
diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
|
||||||
index da9740a99..e87754ef3 100644
|
index da9740a99e..e87754ef33 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityAgeable.java
|
--- a/src/main/java/net/minecraft/server/EntityAgeable.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityAgeable.java
|
+++ b/src/main/java/net/minecraft/server/EntityAgeable.java
|
||||||
@@ -85,6 +85,7 @@ public abstract class EntityAgeable extends EntityCreature {
|
@@ -85,6 +85,7 @@ public abstract class EntityAgeable extends EntityCreature {
|
@ -1,4 +1,4 @@
|
|||||||
From 16d3083eb4af5bfbf22050fa5efdc52452a4304d Mon Sep 17 00:00:00 2001
|
From c595e875930c977f0a9f09219edaababa90bb387 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Fri, 28 Sep 2018 22:27:33 -0400
|
Date: Fri, 28 Sep 2018 22:27:33 -0400
|
||||||
Subject: [PATCH] Don't recheck type after setting a block
|
Subject: [PATCH] Don't recheck type after setting a block
|
||||||
@ -16,7 +16,7 @@ be having data corruption issues anyways.
|
|||||||
This provides a small boost to all setType calls.
|
This provides a small boost to all setType calls.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||||||
index 2b4ad100e..4d96e4fb1 100644
|
index 2b4ad100e0..4d96e4fb12 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Chunk.java
|
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||||||
@@ -339,7 +339,7 @@ public class Chunk implements IChunkAccess {
|
@@ -339,7 +339,7 @@ public class Chunk implements IChunkAccess {
|
@ -1,11 +1,11 @@
|
|||||||
From 397f0632ca0d9587e4ccc3eb585fcf72126c6f03 Mon Sep 17 00:00:00 2001
|
From b969c7eaa41704ba0fdc242a143211138dc6af72 Mon Sep 17 00:00:00 2001
|
||||||
From: Shane Freeder <theboyetronic@gmail.com>
|
From: Shane Freeder <theboyetronic@gmail.com>
|
||||||
Date: Tue, 2 Oct 2018 09:57:50 +0100
|
Date: Tue, 2 Oct 2018 09:57:50 +0100
|
||||||
Subject: [PATCH] Configurable connection throttle kick message
|
Subject: [PATCH] Configurable connection throttle kick message
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
index ffb18902f..2d3861c18 100644
|
index ffb18902ff..2d3861c184 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
@@ -275,6 +275,11 @@ public class PaperConfig {
|
@@ -275,6 +275,11 @@ public class PaperConfig {
|
||||||
@ -21,7 +21,7 @@ index ffb18902f..2d3861c18 100644
|
|||||||
private static void savePlayerData() {
|
private static void savePlayerData() {
|
||||||
savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
|
savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
|
||||||
diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
|
diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
|
||||||
index da88978db..1dad79620 100644
|
index da88978db7..1dad796206 100644
|
||||||
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
|
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
|
||||||
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
|
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
|
||||||
@@ -38,7 +38,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
|
@@ -38,7 +38,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
|
@ -1,4 +1,4 @@
|
|||||||
From 04d90bf82be6f7b17fa6cf1a15b57a8f2e186c47 Mon Sep 17 00:00:00 2001
|
From a10cc485d4ce5bb1f614e74963dc97692abca5c8 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach@zachbr.io>
|
From: Zach Brown <zach@zachbr.io>
|
||||||
Date: Wed, 3 Oct 2018 20:09:18 -0400
|
Date: Wed, 3 Oct 2018 20:09:18 -0400
|
||||||
Subject: [PATCH] Hook into CB plugin rewrites
|
Subject: [PATCH] Hook into CB plugin rewrites
|
||||||
@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're
|
|||||||
debugging in an IDE pre-relocate.
|
debugging in an IDE pre-relocate.
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
|
||||||
index 467b2d938..61f102355 100644
|
index 467b2d9385..61f1023557 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
|
--- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
|
||||||
@@ -6,7 +6,9 @@ import java.io.FileOutputStream;
|
@@ -6,7 +6,9 @@ import java.io.FileOutputStream;
|
@ -1,11 +1,11 @@
|
|||||||
From a9e0d1a0128455b66e09c38a5c2e1426a17e3c2e Mon Sep 17 00:00:00 2001
|
From c371b06835ba7f1737b542fa364b3ec39254289f Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Sat, 6 Oct 2018 21:47:44 -0500
|
Date: Sat, 6 Oct 2018 21:47:44 -0500
|
||||||
Subject: [PATCH] Allow setting the vex's summoner
|
Subject: [PATCH] Allow setting the vex's summoner
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
|
diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
|
||||||
index 83e022c91..c56933068 100644
|
index 83e022c91b..c569330689 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityVex.java
|
--- a/src/main/java/net/minecraft/server/EntityVex.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityVex.java
|
+++ b/src/main/java/net/minecraft/server/EntityVex.java
|
||||||
@@ -133,6 +133,7 @@ public class EntityVex extends EntityMonster {
|
@@ -133,6 +133,7 @@ public class EntityVex extends EntityMonster {
|
||||||
@ -17,7 +17,7 @@ index 83e022c91..c56933068 100644
|
|||||||
this.c = entityinsentient;
|
this.c = entityinsentient;
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
||||||
index 169c951ec..2f7df3074 100644
|
index 169c951ec3..2f7df3074f 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
||||||
@@ -23,6 +23,10 @@ public class CraftVex extends CraftMonster implements Vex {
|
@@ -23,6 +23,10 @@ public class CraftVex extends CraftMonster implements Vex {
|
@ -1,11 +1,11 @@
|
|||||||
From 86fd77f780aa41b7cc576b4bdf0e61a5cf60f961 Mon Sep 17 00:00:00 2001
|
From 66e8f1ef21328f9fa61ce7f5f9adc8e923cc835a Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Sun, 7 Oct 2018 00:54:21 -0500
|
Date: Sun, 7 Oct 2018 00:54:21 -0500
|
||||||
Subject: [PATCH] Add sun related API
|
Subject: [PATCH] Add sun related API
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||||
index f1621a9e9..a8318c88a 100644
|
index f1621a9e9d..a8318c88af 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||||
@@ -1330,6 +1330,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
@@ -1330,6 +1330,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||||
@ -17,7 +17,7 @@ index f1621a9e9..a8318c88a 100644
|
|||||||
if (this.world.J() && !this.world.isClientSide) {
|
if (this.world.J() && !this.world.isClientSide) {
|
||||||
float f = this.aE();
|
float f = this.aE();
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index 830780b49..fee14bb6d 100644
|
index 5220ea0994..70e5552cd9 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -669,6 +669,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
@@ -669,6 +669,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
||||||
@ -29,7 +29,7 @@ index 830780b49..fee14bb6d 100644
|
|||||||
return this.d < 4;
|
return this.d < 4;
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
index ca41b6d6b..073400f23 100644
|
index ca41b6d6ba..073400f23f 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
@@ -740,6 +740,13 @@ public class CraftWorld implements World {
|
@@ -740,6 +740,13 @@ public class CraftWorld implements World {
|
||||||
@ -47,7 +47,7 @@ index ca41b6d6b..073400f23 100644
|
|||||||
public boolean createExplosion(double x, double y, double z, float power) {
|
public boolean createExplosion(double x, double y, double z, float power) {
|
||||||
return createExplosion(x, y, z, power, false, true);
|
return createExplosion(x, y, z, power, false, true);
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
|
||||||
index 53c2d154e..56c233872 100644
|
index 53c2d154ed..56c233872b 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
|
||||||
@@ -68,4 +68,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
|
@@ -68,4 +68,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
|
@ -1,11 +1,11 @@
|
|||||||
From 3a093eec87f06eca566b10f21c8ecb4fab5805ea Mon Sep 17 00:00:00 2001
|
From cfad07b95d70ee56f185c2563f24b38f1c0b8918 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Wed, 10 Oct 2018 21:22:44 -0500
|
Date: Wed, 10 Oct 2018 21:22:44 -0500
|
||||||
Subject: [PATCH] Check Drowned for Villager Aggression Config
|
Subject: [PATCH] Check Drowned for Villager Aggression Config
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
|
diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
|
||||||
index 3d41af863..817769764 100644
|
index 3d41af8637..8177697644 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityDrowned.java
|
--- a/src/main/java/net/minecraft/server/EntityDrowned.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityDrowned.java
|
+++ b/src/main/java/net/minecraft/server/EntityDrowned.java
|
||||||
@@ -29,7 +29,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
|
@@ -29,7 +29,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
|
@ -1,11 +1,11 @@
|
|||||||
From f3d0b16716045edf78c0abf479f5382c2ec6d3aa Mon Sep 17 00:00:00 2001
|
From 0f3ec7603cd6c59d24a99af91e63846ece172b86 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Fri, 12 Oct 2018 01:37:22 -0500
|
Date: Fri, 12 Oct 2018 01:37:22 -0500
|
||||||
Subject: [PATCH] Here's Johnny!
|
Subject: [PATCH] Here's Johnny!
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
|
diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
|
||||||
index dbd189afe..9d3c37dce 100644
|
index dbd189afe6..9d3c37dce9 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityVindicator.java
|
--- a/src/main/java/net/minecraft/server/EntityVindicator.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityVindicator.java
|
+++ b/src/main/java/net/minecraft/server/EntityVindicator.java
|
||||||
@@ -11,7 +11,7 @@ public class EntityVindicator extends EntityIllagerAbstract {
|
@@ -11,7 +11,7 @@ public class EntityVindicator extends EntityIllagerAbstract {
|
||||||
@ -18,7 +18,7 @@ index dbd189afe..9d3c37dce 100644
|
|||||||
public EntityVindicator(EntityTypes<? extends EntityVindicator> entitytypes, World world) {
|
public EntityVindicator(EntityTypes<? extends EntityVindicator> entitytypes, World world) {
|
||||||
super(entitytypes, world);
|
super(entitytypes, world);
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
|
||||||
index 951d47929..5ff957ced 100644
|
index 951d479298..5ff957ced7 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
|
||||||
@@ -25,4 +25,14 @@ public class CraftVindicator extends CraftIllager implements Vindicator {
|
@@ -25,4 +25,14 @@ public class CraftVindicator extends CraftIllager implements Vindicator {
|
@ -1,11 +1,11 @@
|
|||||||
From d37a4df25157249bd33e4ddb13976849176aeb4d Mon Sep 17 00:00:00 2001
|
From bff3057f1d84be16a1918b764bb88974bb39c217 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Sat, 29 Sep 2018 16:08:23 -0500
|
Date: Sat, 29 Sep 2018 16:08:23 -0500
|
||||||
Subject: [PATCH] Turtle API
|
Subject: [PATCH] Turtle API
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
|
diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
|
||||||
index 1b4933c07..b7929c5c4 100644
|
index 1b4933c077..b7929c5c46 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityTurtle.java
|
--- a/src/main/java/net/minecraft/server/EntityTurtle.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityTurtle.java
|
+++ b/src/main/java/net/minecraft/server/EntityTurtle.java
|
||||||
@@ -27,51 +27,63 @@ public class EntityTurtle extends EntityAnimal {
|
@@ -27,51 +27,63 @@ public class EntityTurtle extends EntityAnimal {
|
||||||
@ -104,7 +104,7 @@ index 1b4933c07..b7929c5c4 100644
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
|
||||||
index 123a2c75c..8edcf7af6 100644
|
index 123a2c75ca..8edcf7af65 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
|
||||||
@@ -1,6 +1,8 @@
|
@@ -1,6 +1,8 @@
|
@ -1,11 +1,11 @@
|
|||||||
From b83a25415627e39b211dd487f01524f92ff960dd Mon Sep 17 00:00:00 2001
|
From c34bcd8c7a806455fe6d53d9d65b84632a89e9d9 Mon Sep 17 00:00:00 2001
|
||||||
From: Trigary <trigary0@gmail.com>
|
From: Trigary <trigary0@gmail.com>
|
||||||
Date: Fri, 14 Sep 2018 17:42:08 +0200
|
Date: Fri, 14 Sep 2018 17:42:08 +0200
|
||||||
Subject: [PATCH] Limit lightning strike effect distance
|
Subject: [PATCH] Limit lightning strike effect distance
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
index 2c27be63e..fb44fccc9 100644
|
index 2c27be63ea..fb44fccc92 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
@@ -234,6 +234,28 @@ public class PaperWorldConfig {
|
@@ -234,6 +234,28 @@ public class PaperWorldConfig {
|
||||||
@ -38,7 +38,7 @@ index 2c27be63e..fb44fccc9 100644
|
|||||||
public boolean firePhysicsEventForRedstone = false;
|
public boolean firePhysicsEventForRedstone = false;
|
||||||
private void firePhysicsEventForRedstone() {
|
private void firePhysicsEventForRedstone() {
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java
|
diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java
|
||||||
index adf68d165..fbcda86b3 100644
|
index adf68d1650..fbcda86b38 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityLightning.java
|
--- a/src/main/java/net/minecraft/server/EntityLightning.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityLightning.java
|
+++ b/src/main/java/net/minecraft/server/EntityLightning.java
|
||||||
@@ -64,6 +64,17 @@ public class EntityLightning extends Entity {
|
@@ -64,6 +64,17 @@ public class EntityLightning extends Entity {
|
||||||
@ -69,10 +69,10 @@ index adf68d165..fbcda86b3 100644
|
|||||||
|
|
||||||
--this.lifeTicks;
|
--this.lifeTicks;
|
||||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
index 892c49506..661ea58b8 100644
|
index 9860175ec4..9c4ef2e004 100644
|
||||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||||
@@ -1182,7 +1182,7 @@ public class WorldServer extends World {
|
@@ -1179,7 +1179,7 @@ public class WorldServer extends World {
|
||||||
}
|
}
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
this.globalEntityList.add(entitylightning);
|
this.globalEntityList.add(entitylightning);
|
@ -1,4 +1,4 @@
|
|||||||
From 6e2c48ed3c978e78e0d74fd0d0048dfd1765980d Mon Sep 17 00:00:00 2001
|
From 5b343a1fa590b5869013aca47839c69e10490ab2 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Wed, 17 Oct 2018 19:17:27 -0400
|
Date: Wed, 17 Oct 2018 19:17:27 -0400
|
||||||
Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles
|
Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles
|
||||||
@ -11,7 +11,7 @@ If the projectile fails to find the shooter in the current world, check
|
|||||||
other worlds.
|
other worlds.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
|
diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
|
||||||
index c19828ed5..7deeaa083 100644
|
index c19828ed56..7deeaa0834 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityProjectile.java
|
--- a/src/main/java/net/minecraft/server/EntityProjectile.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityProjectile.java
|
+++ b/src/main/java/net/minecraft/server/EntityProjectile.java
|
||||||
@@ -213,11 +213,21 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
|
@@ -213,11 +213,21 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
|
@ -1,11 +1,11 @@
|
|||||||
From c4bb29d6e705e5938f85ba2c2448daa843c234b6 Mon Sep 17 00:00:00 2001
|
From 2b82315c71a9bcb8c7007800a2efa8324085212d Mon Sep 17 00:00:00 2001
|
||||||
From: Caleb Bassham <caleb.bassham@gmail.com>
|
From: Caleb Bassham <caleb.bassham@gmail.com>
|
||||||
Date: Fri, 28 Sep 2018 02:32:19 -0500
|
Date: Fri, 28 Sep 2018 02:32:19 -0500
|
||||||
Subject: [PATCH] Call player spectator target events
|
Subject: [PATCH] Call player spectator target events
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
index 0f3be967e..1c1c3a9b5 100644
|
index 0f3be967e5..1c1c3a9b58 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
@@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
@@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
@ -1,4 +1,4 @@
|
|||||||
From 2438891aab7c354df7549a2b71c7bc7989795293 Mon Sep 17 00:00:00 2001
|
From 0f101912f19d2a84b07a04113b992fe2f058fafd Mon Sep 17 00:00:00 2001
|
||||||
From: Andrew Steinborn <git@steinborn.me>
|
From: Andrew Steinborn <git@steinborn.me>
|
||||||
Date: Mon, 8 Oct 2018 14:36:14 -0400
|
Date: Mon, 8 Oct 2018 14:36:14 -0400
|
||||||
Subject: [PATCH] Add Velocity IP Forwarding Support
|
Subject: [PATCH] Add Velocity IP Forwarding Support
|
||||||
@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13
|
|||||||
login plugin message packet.
|
login plugin message packet.
|
||||||
|
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
index 2d3861c18..a79cba50e 100644
|
index 2d3861c184..a79cba50e0 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
@@ -8,6 +8,7 @@ import java.io.IOException;
|
@@ -8,6 +8,7 @@ import java.io.IOException;
|
||||||
@ -55,7 +55,7 @@ index 2d3861c18..a79cba50e 100644
|
|||||||
}
|
}
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
|
diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..fdd8708f9
|
index 0000000000..fdd8708f97
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
|
+++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
|
||||||
@@ -0,0 +1,67 @@
|
@@ -0,0 +1,67 @@
|
||||||
@ -127,7 +127,7 @@ index 000000000..fdd8708f9
|
|||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
|
diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
|
||||||
index d4d752ddb..5d46a975e 100644
|
index d4d752ddb4..5d46a975e3 100644
|
||||||
--- a/src/main/java/net/minecraft/server/LoginListener.java
|
--- a/src/main/java/net/minecraft/server/LoginListener.java
|
||||||
+++ b/src/main/java/net/minecraft/server/LoginListener.java
|
+++ b/src/main/java/net/minecraft/server/LoginListener.java
|
||||||
@@ -42,6 +42,7 @@ public class LoginListener implements PacketLoginInListener {
|
@@ -42,6 +42,7 @@ public class LoginListener implements PacketLoginInListener {
|
||||||
@ -203,7 +203,7 @@ index d4d752ddb..5d46a975e 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
|
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
|
||||||
index 6c5544807..38386d588 100644
|
index 6c55448078..38386d5886 100644
|
||||||
--- a/src/main/java/net/minecraft/server/NetworkManager.java
|
--- a/src/main/java/net/minecraft/server/NetworkManager.java
|
||||||
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
|
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
|
||||||
@@ -46,7 +46,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
|
@@ -46,7 +46,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
|
||||||
@ -216,7 +216,7 @@ index 6c5544807..38386d588 100644
|
|||||||
public java.util.UUID spoofedUUID;
|
public java.util.UUID spoofedUUID;
|
||||||
public com.mojang.authlib.properties.Property[] spoofedProfile;
|
public com.mojang.authlib.properties.Property[] spoofedProfile;
|
||||||
diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
|
diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
|
||||||
index fa2d3ce8c..dac560c63 100644
|
index fa2d3ce8cb..dac560c63f 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
|
--- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
|
+++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
|
||||||
@@ -140,6 +140,7 @@ public class PacketDataSerializer extends ByteBuf {
|
@@ -140,6 +140,7 @@ public class PacketDataSerializer extends ByteBuf {
|
||||||
@ -244,7 +244,7 @@ index fa2d3ce8c..dac560c63 100644
|
|||||||
int j = this.i();
|
int j = this.i();
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
|
diff --git a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
|
||||||
index 4d1f44139..c1ca6f950 100644
|
index 4d1f441395..c1ca6f9501 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
|
--- a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
|
+++ b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
|
||||||
@@ -4,8 +4,8 @@ import java.io.IOException;
|
@@ -4,8 +4,8 @@ import java.io.IOException;
|
||||||
@ -259,7 +259,7 @@ index 4d1f44139..c1ca6f950 100644
|
|||||||
public PacketLoginInCustomPayload() {}
|
public PacketLoginInCustomPayload() {}
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
|
diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
|
||||||
index ae74dc9e1..7eb230f1b 100644
|
index ae74dc9e18..7eb230f1b2 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
|
--- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
|
+++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
|
||||||
@@ -10,6 +10,14 @@ public class PacketLoginOutCustomPayload implements Packet<PacketLoginOutListene
|
@@ -10,6 +10,14 @@ public class PacketLoginOutCustomPayload implements Packet<PacketLoginOutListene
|
@ -1,11 +1,11 @@
|
|||||||
From 0e8d054718a2058311545e3c11b1c5ef9675112a Mon Sep 17 00:00:00 2001
|
From 2ab7cfc5a693f04477456c63977e582c74724653 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Fri, 12 Oct 2018 14:10:46 -0500
|
Date: Fri, 12 Oct 2018 14:10:46 -0500
|
||||||
Subject: [PATCH] Add more Witch API
|
Subject: [PATCH] Add more Witch API
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
|
diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
|
||||||
index ae9efb72c..3cbb34a0c 100644
|
index ae9efb72c1..3cbb34a0ce 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityWitch.java
|
--- a/src/main/java/net/minecraft/server/EntityWitch.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityWitch.java
|
+++ b/src/main/java/net/minecraft/server/EntityWitch.java
|
||||||
@@ -1,5 +1,11 @@
|
@@ -1,5 +1,11 @@
|
||||||
@ -96,7 +96,7 @@ index ae9efb72c..3cbb34a0c 100644
|
|||||||
public SoundEffect dW() {
|
public SoundEffect dW() {
|
||||||
return SoundEffects.ENTITY_WITCH_CELEBRATE;
|
return SoundEffects.ENTITY_WITCH_CELEBRATE;
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
|
||||||
index bae107e76..b43a2bbd5 100644
|
index bae107e76e..b43a2bbd5b 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
|
||||||
@@ -1,12 +1,18 @@
|
@@ -1,12 +1,18 @@
|
@ -1,11 +1,11 @@
|
|||||||
From b99595bced24c8b10e641089ee1b81b81c89f35f Mon Sep 17 00:00:00 2001
|
From f45f3b13ae7da7619a327e8b3ccb8ebf9add5feb Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Fri, 19 Oct 2018 19:38:45 -0500
|
Date: Fri, 19 Oct 2018 19:38:45 -0500
|
||||||
Subject: [PATCH] Fix MC-93764
|
Subject: [PATCH] Fix MC-93764
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
|
diff --git a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
|
||||||
index 715faef17..b97408cff 100644
|
index 715faef171..b97408cffa 100644
|
||||||
--- a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
|
--- a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
|
||||||
+++ b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
|
+++ b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
|
||||||
@@ -27,7 +27,7 @@ public class WorldProviderTheEnd extends WorldProvider {
|
@@ -27,7 +27,7 @@ public class WorldProviderTheEnd extends WorldProvider {
|
@ -1,4 +1,4 @@
|
|||||||
From a46f8e0c304dc2f0dee724d7ac35f09b965ffbe0 Mon Sep 17 00:00:00 2001
|
From 99e2e5d7f90954efd632c54d186ae0ab54189f95 Mon Sep 17 00:00:00 2001
|
||||||
From: Gabriele C <sgdc3.mail@gmail.com>
|
From: Gabriele C <sgdc3.mail@gmail.com>
|
||||||
Date: Mon, 22 Oct 2018 17:34:10 +0200
|
Date: Mon, 22 Oct 2018 17:34:10 +0200
|
||||||
Subject: [PATCH] Add option to prevent players from moving into unloaded
|
Subject: [PATCH] Add option to prevent players from moving into unloaded
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
index fb44fccc9..ad793ffa3 100644
|
index fb44fccc92..ad793ffa38 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
@@ -434,4 +434,9 @@ public class PaperWorldConfig {
|
@@ -434,4 +434,9 @@ public class PaperWorldConfig {
|
||||||
@ -20,7 +20,7 @@ index fb44fccc9..ad793ffa3 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
index 07e9abda9..4ba13da1a 100644
|
index 07e9abda96..4ba13da1ad 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
@@ -347,6 +347,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
@@ -347,6 +347,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
@ -1,11 +1,11 @@
|
|||||||
From cf8dc731a198046af0f477ff9d04e31265c31a14 Mon Sep 17 00:00:00 2001
|
From 20e1ffb268c190adc3e0712329f59e8e4d73c5bf Mon Sep 17 00:00:00 2001
|
||||||
From: GreenMeanie <GreenMeanieMC@gmail.com>
|
From: GreenMeanie <GreenMeanieMC@gmail.com>
|
||||||
Date: Sat, 20 Oct 2018 22:34:02 -0400
|
Date: Sat, 20 Oct 2018 22:34:02 -0400
|
||||||
Subject: [PATCH] Reset players airTicks on respawn
|
Subject: [PATCH] Reset players airTicks on respawn
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||||
index b1cf9b85f..91a7925dd 100644
|
index b1cf9b85fa..91a7925dd2 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||||
@@ -2268,7 +2268,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@@ -2268,7 +2268,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||||
@ -18,7 +18,7 @@ index b1cf9b85f..91a7925dd 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
index 1c1c3a9b5..e1f618684 100644
|
index 1c1c3a9b58..e1f618684c 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
@@ -1857,6 +1857,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
@@ -1857,6 +1857,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
@ -1,4 +1,4 @@
|
|||||||
From 7d88f5608cfd251ea0135286fadbce3017465eb2 Mon Sep 17 00:00:00 2001
|
From 6a1366240d0a49be8672b204580a3d4193a40a13 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach@zachbr.io>
|
From: Zach Brown <zach@zachbr.io>
|
||||||
Date: Tue, 23 Oct 2018 20:53:43 -0400
|
Date: Tue, 23 Oct 2018 20:53:43 -0400
|
||||||
Subject: [PATCH] Strip private area unicode characters from signs
|
Subject: [PATCH] Strip private area unicode characters from signs
|
||||||
@ -20,7 +20,7 @@ think of no reason to use it.
|
|||||||
Fixes GH-1571
|
Fixes GH-1571
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
|
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
|
||||||
index 626ba9b17..7b5d534f4 100644
|
index 626ba9b178..7b5d534f4b 100644
|
||||||
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
|
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
|
||||||
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
|
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
|
||||||
@@ -14,6 +14,11 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
|
@@ -14,6 +14,11 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
|
@ -1,4 +1,4 @@
|
|||||||
From 8a65bcf0402b43faf4d94299e205b1de8d8e15e8 Mon Sep 17 00:00:00 2001
|
From 5c1b8e438091417fb534c03794eec54f8c26af7c Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Tue, 23 Oct 2018 20:25:05 -0400
|
Date: Tue, 23 Oct 2018 20:25:05 -0400
|
||||||
Subject: [PATCH] Don't sleep after profile lookups if not needed
|
Subject: [PATCH] Don't sleep after profile lookups if not needed
|
||||||
@ -7,7 +7,7 @@ Mojang was sleeping even if we had no more requests to go after
|
|||||||
the current one finished, resulting in 100ms lost per profile lookup
|
the current one finished, resulting in 100ms lost per profile lookup
|
||||||
|
|
||||||
diff --git a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
|
diff --git a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
|
||||||
index 71e48e87b..23f1447cf 100644
|
index 71e48e87b4..23f1447cfc 100644
|
||||||
--- a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
|
--- a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
|
||||||
+++ b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
|
+++ b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
|
||||||
@@ -42,6 +42,7 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository {
|
@@ -42,6 +42,7 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository {
|
@ -1,11 +1,11 @@
|
|||||||
From b8d8a3ccf38dc16afce3222d25187059256fca24 Mon Sep 17 00:00:00 2001
|
From d9a13a84b740aab1f61ec78a2c2ae1bc18a670b6 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Tue, 23 Oct 2018 23:14:38 -0400
|
Date: Tue, 23 Oct 2018 23:14:38 -0400
|
||||||
Subject: [PATCH] Use more reasonable thread count default for bootstrap
|
Subject: [PATCH] Use more reasonable thread count default for bootstrap
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
|
diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
|
||||||
index 5fae5a123..6bc576f10 100644
|
index 5fae5a1233..6bc576f10f 100644
|
||||||
--- a/src/main/java/net/minecraft/server/SystemUtils.java
|
--- a/src/main/java/net/minecraft/server/SystemUtils.java
|
||||||
+++ b/src/main/java/net/minecraft/server/SystemUtils.java
|
+++ b/src/main/java/net/minecraft/server/SystemUtils.java
|
||||||
@@ -66,7 +66,7 @@ public class SystemUtils {
|
@@ -66,7 +66,7 @@ public class SystemUtils {
|
@ -1,4 +1,4 @@
|
|||||||
From a78ed2192a056e3311e6745b0962666697315077 Mon Sep 17 00:00:00 2001
|
From 22ac6a9266824514c0c7d87f1baf447a49931824 Mon Sep 17 00:00:00 2001
|
||||||
From: MisterVector <whizkid3000@hotmail.com>
|
From: MisterVector <whizkid3000@hotmail.com>
|
||||||
Date: Thu, 1 Nov 2018 14:50:05 -0700
|
Date: Thu, 1 Nov 2018 14:50:05 -0700
|
||||||
Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block
|
Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block
|
||||||
@ -13,7 +13,7 @@ keep the clone of the item used to a non empty value so it represents
|
|||||||
the item used.
|
the item used.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
|
diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
|
||||||
index f692da609..5bc8bd7cd 100644
|
index f692da609b..5bc8bd7cdc 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
|
--- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
|
+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
|
||||||
@@ -354,10 +354,11 @@ public class PlayerInteractManager {
|
@@ -354,10 +354,11 @@ public class PlayerInteractManager {
|
@ -1,4 +1,4 @@
|
|||||||
From 1a9a458d2db1bb48a62b9b8f009459e508263d3b Mon Sep 17 00:00:00 2001
|
From c9287ae57a9e0346476aad606cead3bad2dfa3eb Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Fri, 2 Nov 2018 23:11:51 -0400
|
Date: Fri, 2 Nov 2018 23:11:51 -0400
|
||||||
Subject: [PATCH] Optimize World Time Updates
|
Subject: [PATCH] Optimize World Time Updates
|
||||||
@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet
|
|||||||
object for every player unless they have per-player time enabled.
|
object for every player unless they have per-player time enabled.
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
index 0a02dece6..1858e956b 100644
|
index 0a02dece68..1858e956b5 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -1119,12 +1119,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
@@ -1119,12 +1119,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
@ -1,4 +1,4 @@
|
|||||||
From 4a37b045c016897214bc00dceabedbeb5f3957f1 Mon Sep 17 00:00:00 2001
|
From ee0341ae9aeb64368eefaf5090e8097b62df28d5 Mon Sep 17 00:00:00 2001
|
||||||
From: Shane Freeder <theboyetronic@gmail.com>
|
From: Shane Freeder <theboyetronic@gmail.com>
|
||||||
Date: Mon, 5 Nov 2018 04:23:51 +0000
|
Date: Mon, 5 Nov 2018 04:23:51 +0000
|
||||||
Subject: [PATCH] Restore custom InventoryHolder support
|
Subject: [PATCH] Restore custom InventoryHolder support
|
||||||
@ -17,7 +17,7 @@ will always work as intended in the past, those without will create implementati
|
|||||||
based inventories.
|
based inventories.
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
|
||||||
index 9957ed040..ae280dd40 100644
|
index 9957ed0402..ae280dd40b 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
|
||||||
@@ -39,10 +39,20 @@ public final class CraftInventoryCreator {
|
@@ -39,10 +39,20 @@ public final class CraftInventoryCreator {
|
@ -1,4 +1,4 @@
|
|||||||
From 40bdfc69e61ae7de077f81d346584a706c2de5b2 Mon Sep 17 00:00:00 2001
|
From b21ba787ad72df2d5a2797af54899858b1f1d2b3 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Thu, 8 Nov 2018 21:33:09 -0500
|
Date: Thu, 8 Nov 2018 21:33:09 -0500
|
||||||
Subject: [PATCH] Use Vanilla Minecart Speeds
|
Subject: [PATCH] Use Vanilla Minecart Speeds
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] Use Vanilla Minecart Speeds
|
|||||||
CraftBukkit changed the values on flying speed, restore back to vanilla
|
CraftBukkit changed the values on flying speed, restore back to vanilla
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
|
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
|
||||||
index 6fc332dbf..828a8711d 100644
|
index 6fc332dbff..828a8711d1 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
|
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
|
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
|
||||||
@@ -35,9 +35,9 @@ public abstract class EntityMinecartAbstract extends Entity {
|
@@ -35,9 +35,9 @@ public abstract class EntityMinecartAbstract extends Entity {
|
@ -1,4 +1,4 @@
|
|||||||
From bd5ffdf5d23fd7077da1ef8e76177882e41c3004 Mon Sep 17 00:00:00 2001
|
From f9882d938dfe10a599af85e4e17bab06157305cd Mon Sep 17 00:00:00 2001
|
||||||
From: Shane Freeder <theboyetronic@gmail.com>
|
From: Shane Freeder <theboyetronic@gmail.com>
|
||||||
Date: Sat, 10 Nov 2018 05:15:21 +0000
|
Date: Sat, 10 Nov 2018 05:15:21 +0000
|
||||||
Subject: [PATCH] Fix SpongeAbsortEvent handling
|
Subject: [PATCH] Fix SpongeAbsortEvent handling
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] Fix SpongeAbsortEvent handling
|
|||||||
Only process drops when the block is actually going to be removed
|
Only process drops when the block is actually going to be removed
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
|
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
|
||||||
index 8d69a1556..5b98c5255 100644
|
index 8d69a1556a..5b98c52559 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Block.java
|
--- a/src/main/java/net/minecraft/server/Block.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Block.java
|
+++ b/src/main/java/net/minecraft/server/Block.java
|
||||||
@@ -473,7 +473,7 @@ public class Block implements IMaterial {
|
@@ -473,7 +473,7 @@ public class Block implements IMaterial {
|
||||||
@ -19,7 +19,7 @@ index 8d69a1556..5b98c5255 100644
|
|||||||
if (world instanceof WorldServer) {
|
if (world instanceof WorldServer) {
|
||||||
a(iblockdata, (WorldServer) world, blockposition, tileentity).forEach((itemstack) -> {
|
a(iblockdata, (WorldServer) world, blockposition, tileentity).forEach((itemstack) -> {
|
||||||
diff --git a/src/main/java/net/minecraft/server/BlockSponge.java b/src/main/java/net/minecraft/server/BlockSponge.java
|
diff --git a/src/main/java/net/minecraft/server/BlockSponge.java b/src/main/java/net/minecraft/server/BlockSponge.java
|
||||||
index 4e281ce6d..6a64af71b 100644
|
index 4e281ce6dd..6a64af71b9 100644
|
||||||
--- a/src/main/java/net/minecraft/server/BlockSponge.java
|
--- a/src/main/java/net/minecraft/server/BlockSponge.java
|
||||||
+++ b/src/main/java/net/minecraft/server/BlockSponge.java
|
+++ b/src/main/java/net/minecraft/server/BlockSponge.java
|
||||||
@@ -113,8 +113,11 @@ public class BlockSponge extends Block {
|
@@ -113,8 +113,11 @@ public class BlockSponge extends Block {
|
@ -1,11 +1,11 @@
|
|||||||
From 8258ab7472f39b956fb975a6a6f756616bb74f1d Mon Sep 17 00:00:00 2001
|
From bfbeaf6410c9fb749622b3a8aeca49c6926c2705 Mon Sep 17 00:00:00 2001
|
||||||
From: Shane Freeder <theboyetronic@gmail.com>
|
From: Shane Freeder <theboyetronic@gmail.com>
|
||||||
Date: Sun, 11 Nov 2018 21:01:09 +0000
|
Date: Sun, 11 Nov 2018 21:01:09 +0000
|
||||||
Subject: [PATCH] Don't allow digging into unloaded chunks
|
Subject: [PATCH] Don't allow digging into unloaded chunks
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
index 4ba13da1a..a887be15c 100644
|
index 4ba13da1ad..a887be15cc 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
@@ -1246,6 +1246,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
@@ -1246,6 +1246,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
@ -1,4 +1,4 @@
|
|||||||
From 43705821706467660596aa9b64e3f2342e7a6ed3 Mon Sep 17 00:00:00 2001
|
From d74e7d03f12f94e8e34a22c6c998581f2571877a Mon Sep 17 00:00:00 2001
|
||||||
From: theosib <millerti@172.16.221.1>
|
From: theosib <millerti@172.16.221.1>
|
||||||
Date: Thu, 27 Sep 2018 01:43:35 -0600
|
Date: Thu, 27 Sep 2018 01:43:35 -0600
|
||||||
Subject: [PATCH] Optimize redstone algorithm
|
Subject: [PATCH] Optimize redstone algorithm
|
||||||
@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
|
|||||||
Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
|
Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
|
||||||
|
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
index ad793ffa3..ef882b897 100644
|
index ad793ffa38..ef882b897f 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
@@ -439,4 +439,14 @@ public class PaperWorldConfig {
|
@@ -439,4 +439,14 @@ public class PaperWorldConfig {
|
||||||
@ -39,7 +39,7 @@ index ad793ffa3..ef882b897 100644
|
|||||||
}
|
}
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
|
diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 000000000..cf5661f1c
|
index 0000000000..cf5661f1c5
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
|
+++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
|
||||||
@@ -0,0 +1,912 @@
|
@@ -0,0 +1,912 @@
|
||||||
@ -956,7 +956,7 @@ index 000000000..cf5661f1c
|
|||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
|
diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
|
||||||
index da903f74b..aa35e0d06 100644
|
index da903f74b6..aa35e0d061 100644
|
||||||
--- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
|
--- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
|
||||||
+++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
|
+++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
|
||||||
@@ -1,5 +1,7 @@
|
@@ -1,5 +1,7 @@
|
||||||
@ -1124,7 +1124,7 @@ index da903f74b..aa35e0d06 100644
|
|||||||
c(iblockdata, world, blockposition);
|
c(iblockdata, world, blockposition);
|
||||||
world.a(blockposition, false);
|
world.a(blockposition, false);
|
||||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
index fee14bb6d..388692c32 100644
|
index 70e5552cd9..d20077892b 100644
|
||||||
--- a/src/main/java/net/minecraft/server/World.java
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
+++ b/src/main/java/net/minecraft/server/World.java
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
@@ -548,6 +548,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
@@ -548,6 +548,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
||||||
@ -1135,7 +1135,7 @@ index fee14bb6d..388692c32 100644
|
|||||||
public void a(BlockPosition blockposition, Block block, BlockPosition blockposition1) {
|
public void a(BlockPosition blockposition, Block block, BlockPosition blockposition1) {
|
||||||
if (!this.isClientSide) {
|
if (!this.isClientSide) {
|
||||||
IBlockData iblockdata = this.getType(blockposition);
|
IBlockData iblockdata = this.getType(blockposition);
|
||||||
@@ -1306,6 +1307,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
@@ -1304,6 +1305,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
||||||
return this.getBlockFacePower(blockposition.down(), EnumDirection.DOWN) > 0 ? true : (this.getBlockFacePower(blockposition.up(), EnumDirection.UP) > 0 ? true : (this.getBlockFacePower(blockposition.north(), EnumDirection.NORTH) > 0 ? true : (this.getBlockFacePower(blockposition.south(), EnumDirection.SOUTH) > 0 ? true : (this.getBlockFacePower(blockposition.west(), EnumDirection.WEST) > 0 ? true : this.getBlockFacePower(blockposition.east(), EnumDirection.EAST) > 0))));
|
return this.getBlockFacePower(blockposition.down(), EnumDirection.DOWN) > 0 ? true : (this.getBlockFacePower(blockposition.up(), EnumDirection.UP) > 0 ? true : (this.getBlockFacePower(blockposition.north(), EnumDirection.NORTH) > 0 ? true : (this.getBlockFacePower(blockposition.south(), EnumDirection.SOUTH) > 0 ? true : (this.getBlockFacePower(blockposition.west(), EnumDirection.WEST) > 0 ? true : this.getBlockFacePower(blockposition.east(), EnumDirection.EAST) > 0))));
|
||||||
}
|
}
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
From 3b9e28226a8ab1060744b350de7445df15849a5a Mon Sep 17 00:00:00 2001
|
From 5c064b2fb3998d445755cb7ca2855cc244a5d501 Mon Sep 17 00:00:00 2001
|
||||||
From: Shane Freeder <theboyetronic@gmail.com>
|
From: Shane Freeder <theboyetronic@gmail.com>
|
||||||
Date: Thu, 15 Nov 2018 13:38:37 +0000
|
Date: Thu, 15 Nov 2018 13:38:37 +0000
|
||||||
Subject: [PATCH] force entity dismount during teleportation
|
Subject: [PATCH] force entity dismount during teleportation
|
||||||
@ -20,7 +20,7 @@ this is going to be the best soultion all around.
|
|||||||
Improvements/suggestions welcome!
|
Improvements/suggestions welcome!
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||||
index 91a7925dd..c71dc3614 100644
|
index 91a7925dd2..c71dc36141 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||||
@@ -1990,12 +1990,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
@@ -1990,12 +1990,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||||
@ -72,7 +72,7 @@ index 91a7925dd..c71dc3614 100644
|
|||||||
if (event.isCancelled()) {
|
if (event.isCancelled()) {
|
||||||
return false;
|
return false;
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||||
index 2f614dfb6..4bea5f1ea 100644
|
index 2f614dfb6b..4bea5f1ea2 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||||
@@ -937,9 +937,11 @@ public abstract class EntityHuman extends EntityLiving {
|
@@ -937,9 +937,11 @@ public abstract class EntityHuman extends EntityLiving {
|
||||||
@ -91,7 +91,7 @@ index 2f614dfb6..4bea5f1ea 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
index 2631e9a4b..75608c8a1 100644
|
index 2631e9a4ba..75608c8a1e 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||||
@@ -2661,11 +2661,13 @@ public abstract class EntityLiving extends Entity {
|
@@ -2661,11 +2661,13 @@ public abstract class EntityLiving extends Entity {
|
||||||
@ -112,7 +112,7 @@ index 2631e9a4b..75608c8a1 100644
|
|||||||
this.B(entity);
|
this.B(entity);
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
index e1f618684..0c289f23b 100644
|
index e1f618684c..0c289f23b0 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
@@ -997,11 +997,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
@@ -997,11 +997,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
@ -1,4 +1,4 @@
|
|||||||
From c335294d30c27c8a13d79692ee1ad4dc2345967c Mon Sep 17 00:00:00 2001
|
From 7e0b5cde3d4df722b9ada5763458b8a7d6fb03c3 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Fri, 16 Nov 2018 23:08:50 -0500
|
Date: Fri, 16 Nov 2018 23:08:50 -0500
|
||||||
Subject: [PATCH] Book Size Limits
|
Subject: [PATCH] Book Size Limits
|
||||||
@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits
|
|||||||
Puts some limits on the size of books.
|
Puts some limits on the size of books.
|
||||||
|
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
index a79cba50e..e5e41c662 100644
|
index a79cba50e0..e5e41c6621 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
@@ -375,4 +375,11 @@ public class PaperConfig {
|
@@ -375,4 +375,11 @@ public class PaperConfig {
|
||||||
@ -22,7 +22,7 @@ index a79cba50e..e5e41c662 100644
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
index a887be15c..baab1a88a 100644
|
index a887be15cc..baab1a88a4 100644
|
||||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||||
@@ -14,6 +14,7 @@ import java.util.Iterator;
|
@@ -14,6 +14,7 @@ import java.util.Iterator;
|
@ -1,11 +1,11 @@
|
|||||||
From c44b0f8d58232a141fcb2cff363d947afbe5be5a Mon Sep 17 00:00:00 2001
|
From 6b0f9cbc19378091d7fa2bb49d775035bb858e32 Mon Sep 17 00:00:00 2001
|
||||||
From: Shane Freeder <theboyetronic@gmail.com>
|
From: Shane Freeder <theboyetronic@gmail.com>
|
||||||
Date: Sun, 18 Nov 2018 19:49:56 +0000
|
Date: Sun, 18 Nov 2018 19:49:56 +0000
|
||||||
Subject: [PATCH] Make the default permission message configurable
|
Subject: [PATCH] Make the default permission message configurable
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
index e5e41c662..8942a06bf 100644
|
index e5e41c6621..8942a06bfe 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||||
@@ -21,6 +21,7 @@ import java.util.regex.Pattern;
|
@@ -21,6 +21,7 @@ import java.util.regex.Pattern;
|
||||||
@ -29,7 +29,7 @@ index e5e41c662..8942a06bf 100644
|
|||||||
private static void savePlayerData() {
|
private static void savePlayerData() {
|
||||||
savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
|
savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
index 467583f1d..050bf3eb4 100644
|
index 467583f1dc..050bf3eb48 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
@@ -2123,6 +2123,11 @@ public final class CraftServer implements Server {
|
@@ -2123,6 +2123,11 @@ public final class CraftServer implements Server {
|
@ -1,11 +1,11 @@
|
|||||||
From 7685c146ffe17dc7cab2d4ef3b1512602b06a1a0 Mon Sep 17 00:00:00 2001
|
From d6295b76112bd2ac3352086abd6c732a6b18a181 Mon Sep 17 00:00:00 2001
|
||||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Sun, 7 Oct 2018 04:29:59 -0500
|
Date: Sun, 7 Oct 2018 04:29:59 -0500
|
||||||
Subject: [PATCH] Add more Zombie API
|
Subject: [PATCH] Add more Zombie API
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||||
index a8318c88a..ba90cdef1 100644
|
index a8318c88af..ba90cdef16 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||||
@@ -1250,6 +1250,8 @@ public abstract class EntityInsentient extends EntityLiving {
|
@@ -1250,6 +1250,8 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||||
@ -18,7 +18,7 @@ index a8318c88a..ba90cdef1 100644
|
|||||||
byte b0 = (Byte) this.datawatcher.get(EntityInsentient.b);
|
byte b0 = (Byte) this.datawatcher.get(EntityInsentient.b);
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
|
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
|
||||||
index 171c1ae4a..b20fe8e52 100644
|
index 171c1ae4ad..b20fe8e521 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityZombie.java
|
--- a/src/main/java/net/minecraft/server/EntityZombie.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
|
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
|
||||||
@@ -31,6 +31,7 @@ public class EntityZombie extends EntityMonster {
|
@@ -31,6 +31,7 @@ public class EntityZombie extends EntityMonster {
|
||||||
@ -92,7 +92,7 @@ index 171c1ae4a..b20fe8e52 100644
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
|
||||||
index 0429cf020..c4320dbb6 100644
|
index 0429cf020e..c4320dbb67 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
|
||||||
@@ -80,4 +80,41 @@ public class CraftZombie extends CraftMonster implements Zombie {
|
@@ -80,4 +80,41 @@ public class CraftZombie extends CraftMonster implements Zombie {
|
Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden Mehr anzeigen
In neuem Issue referenzieren
Einen Benutzer sperren