SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Aktivität

Update upstream B/CB/S

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Zach Brown 2017-05-04 18:08:52 -05:00
Ursprung d3f692b39b
Commit 26d7646a75
23 geänderte Dateien mit 25 neuen und 92 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
Spigot-Server-Patches/Add-EntityZapEvent.patch
Datei anzeigen

@ -48,7 +48,7 @@ index ee11691bf..4ad75468c 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 95b12331e..4d252aa47 100644
index 8158c4801..d77eefd6f 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -0,0 +0,0 @@ public class CraftEventFactory {

2
Spigot-Server-Patches/Add-ProjectileCollideEvent.patch
Datei anzeigen

@ -86,7 +86,7 @@ index 6fbc84559..a8b9d9263 100644
if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.PORTAL) {
this.e(movingobjectposition.a());
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 7e4982d93..a850a9634 100644
index 999e38878..e669f0878 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -0,0 +0,0 @@ public class CraftEventFactory {

2
Spigot-Server-Patches/Add-option-to-remove-invalid-statistics.patch
Datei anzeigen

@ -5,7 +5,7 @@ Subject: [PATCH] Add option to remove invalid statistics
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 009bf0c8b..a901cd85c 100644
index db2a4c2c7..e936264c5 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -0,0 +0,0 @@ public class PaperConfig {

2
Spigot-Server-Patches/Add-setting-for-proxy-online-mode-status.patch
Datei anzeigen

@ -5,7 +5,7 @@ Subject: [PATCH] Add setting for proxy online mode status
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index e009e5cf2..276185d9a 100644
index 0140d1981..c758bde3f 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -0,0 +0,0 @@ public class PaperConfig {

2
Spigot-Server-Patches/Add-source-to-PlayerExpChangeEvent.patch
Datei anzeigen

@ -18,7 +18,7 @@ index 4b3816465..14431b8ad 100644
this.die();
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 4d252aa47..7e4982d93 100644
index d77eefd6f..999e38878 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -0,0 +0,0 @@ import org.bukkit.entity.Player;

4
Spigot-Server-Patches/Auto-Save-Improvements.patch
Datei anzeigen

@ -12,7 +12,7 @@ Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and
Adds incremental player auto saving too
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index f86729724..009bf0c8b 100644
index 5b4d715a4..db2a4c2c7 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -0,0 +0,0 @@ public class PaperConfig {
@ -192,7 +192,7 @@ index 97322c5da..58f30fb1d 100644
public void addWhitelist(GameProfile gameprofile) {
this.whitelist.add(new WhiteListEntry(gameprofile));
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index f969d2a72..cc0e8d2c8 100644
index f80647b31..914c20282 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {

4
Spigot-Server-Patches/Be-a-bit-more-informative-in-maxHealth-exception.patch
Datei anzeigen

@ -5,7 +5,7 @@ Subject: [PATCH] Be a bit more informative in maxHealth exception
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 27cd0d43d..61032eb2f 100644
index 5fbd12471..062a0fd55 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@ -19,5 +19,5 @@ index 27cd0d43d..61032eb2f 100644
+ + (this instanceof CraftPlayer ? ", player: " + this.getName() + ')' : ')'));
}
if (health == 0) {
getHandle().setHealth((float) health);
--

2
Spigot-Server-Patches/Catch-Async-PlayerChunkMap-operations.patch
Datei anzeigen

@ -5,7 +5,7 @@ Subject: [PATCH] Catch Async PlayerChunkMap operations
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index 9012a63a0..5b27bd1c5 100644
index cfac05750..0a0b5261b 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -0,0 +0,0 @@ public class PlayerChunkMap {

2
Spigot-Server-Patches/Configurable-Player-Collision.patch
Datei anzeigen

@ -5,7 +5,7 @@ Subject: [PATCH] Configurable Player Collision
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index c3ff47e00..710c432d8 100644
index 62cbe0cf3..dae321d01 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -0,0 +0,0 @@ public class PaperConfig {

2
Spigot-Server-Patches/Configurable-flying-kick-messages.patch
Datei anzeigen

@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flying kick messages
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index bb4114b8d..f86729724 100644
index d765607c0..5b4d715a4 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -0,0 +0,0 @@ public class PaperConfig {

2
Spigot-Server-Patches/Configurable-packet-in-spam-threshold.patch
Datei anzeigen

@ -5,7 +5,7 @@ Subject: [PATCH] Configurable packet in spam threshold
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 276185d9a..bb4114b8d 100644
index c758bde3f..d765607c0 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -0,0 +0,0 @@ public class PaperConfig {

2
Spigot-Server-Patches/Configurable-spawn-chances-for-skeleton-horses.patch
Datei anzeigen

@ -19,7 +19,7 @@ index b37b5901b..adc810720 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index ac8dc5f2f..39ed0d533 100644
index 9b059e52c..de900920a 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {

2
Spigot-Server-Patches/Delay-Chunk-Unloads-based-on-Player-Movement.patch
Datei anzeigen

@ -108,7 +108,7 @@ index dd40e98c8..f109e986d 100644
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index 5b27bd1c5..b163346be 100644
index 0a0b5261b..14ea89c91 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -0,0 +0,0 @@ public class PlayerChunkMap {

2
Spigot-Server-Patches/Disable-Vanilla-Chunk-GC.patch
Datei anzeigen

@ -6,7 +6,7 @@ Subject: [PATCH] Disable Vanilla Chunk GC
Bukkit has its own system for this.
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index cc0e8d2c8..7a6d11f20 100644
index 914c20282..fdec385a7 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {

2
Spigot-Server-Patches/Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
Datei anzeigen

@ -5,7 +5,7 @@ Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 710c432d8..e009e5cf2 100644
index dae321d01..0140d1981 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -0,0 +0,0 @@ public class PaperConfig {

2
Spigot-Server-Patches/Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
Datei anzeigen

@ -38,7 +38,7 @@ index 9427fc080..8cbdbda92 100644
this.getServer().getPluginManager().callEvent(event);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 39ed0d533..f969d2a72 100644
index de900920a..f80647b31 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ import org.bukkit.event.weather.LightningStrikeEvent;

20
Spigot-Server-Patches/Raise-book-max-title-length-to-32.patch
Datei anzeigen

@ -1,20 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sat, 29 Apr 2017 20:41:58 -0500
Subject: [PATCH] Raise book max title length to 32
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
index dfeeb54e6..0c7ae36b4 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
@@ -0,0 +0,0 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
static final ItemMetaKey GENERATION = new ItemMetaKey("generation");
static final int MAX_PAGES = 50;
static final int MAX_PAGE_LENGTH = 256;
- static final int MAX_TITLE_LENGTH = 16;
+ static final int MAX_TITLE_LENGTH = 32; // Paper
protected String title;
protected String author;
--

6
Spigot-Server-Patches/Sanitise-RegionFileCache-and-make-configurable.patch
Datei anzeigen

@ -11,12 +11,12 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap).
The maximum size of the RegionFileCache is also made configurable.
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 6907d4680..c3ff47e00 100644
index b5ff26c71..62cbe0cf3 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -0,0 +0,0 @@ public class PaperConfig {
private static void healthDeath() {
setHealthBeforeDeathEvent = getBoolean("settings.set-health-before-death-event", false);
private static void loadPermsBeforePlugins() {
loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
}
+
+ public static int regionFileCacheSize = 256;

47
Spigot-Server-Patches/Set-health-before-death-event.patch
Datei anzeigen

@ -1,47 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 19 Jul 2015 16:51:38 -0400
Subject: [PATCH] Set health before death event
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index b5ff26c71..6907d4680 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -0,0 +0,0 @@ public class PaperConfig {
private static void loadPermsBeforePlugins() {
loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
}
+
+ public static boolean setHealthBeforeDeathEvent = false;
+ private static void healthDeath() {
+ setHealthBeforeDeathEvent = getBoolean("settings.set-health-before-death-event", false);
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 348a8c758..c0103cb39 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+ (this instanceof CraftPlayer ? ", player: " + this.getName() + ')' : ')'));
}
+ // Paper start
+ if (com.destroystokyo.paper.PaperConfig.setHealthBeforeDeathEvent) {
+ this.getHandle().setHealth((float) health);
+ }
+
if (health == 0) {
getHandle().die(DamageSource.GENERIC);
}
- getHandle().setHealth((float) health);
+ // Paper start - wrap, see above
+ if (!com.destroystokyo.paper.PaperConfig.setHealthBeforeDeathEvent) {
+ getHandle().setHealth((float) health);
+ }
+ // Paper end
}
public double getMaxHealth() {
--

2
Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch
Datei anzeigen

@ -78,7 +78,7 @@ index 2fa63a27f..7af76e14c 100644
this.getServer().getPluginManager().callEvent(event);
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index a850a9634..59942d9cb 100644
index e669f0878..afdd4ab70 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -0,0 +0,0 @@ public class CraftEventFactory {

2
work/Bukkit

@ -1 +1 @@
Subproject commit 7861de61e648464ce3e3dd635ed19f92521fc952
Subproject commit 7450a0255b79a2a4675d31946ebda8716394bbed

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit a2af8f0a730c11af84d995ccfcf36544ddb4eea0
Subproject commit 2b6c9f40aef19b5366a8ecd6bf2bb9900ce3c684

2
work/Spigot

@ -1 +1 @@
Subproject commit a3f6ea510b919b8d64636ed6be3b7b23af9e6b16
Subproject commit 3fb9445eca2b29aaae34bf5723cfd8da3fc1bf1d