mirror of
https://github.com/PaperMC/Paper.git
synced 2025-07-31 04:02:06 -07:00
Update from upstream SpigotMC
Included Commits: Update IRC channel to irc.spi.gt SpigotMC/Spigot@a791c555e7 Remove inv close patch for now SpigotMC/Spigot@a3abb3bea9 Limit TNT Detonations per tick SpigotMC/Spigot@8f9c601aed Use sane default config values SpigotMC/Spigot@1cbbb9b62e These commits were not included as they were quickly reverted: Only close if we are actually placing a block SpigotMC/Spigot@ea0b1b2d67 Revert for the above SpigotMC/Spigot@28faa0bd20 Add isUnbreakable and setUnbreakable to ItemMeta. Also fixes a bug wh... SpigotMC/Spigot@32e6d74a5f Revert for the above SpigotMC/Spigot@4b5a26b11c
This commit is contained in:
@@ -131,8 +131,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ + "If you need help with the configuration or have any questions related to Spigot,\n"
|
||||
+ + "join us at the IRC or drop by our forums and leave a post.\n"
|
||||
+ + "\n"
|
||||
+ + "IRC: #spigot @ irc.esper.net ( http://webchat.esper.net/?channel=spigot )\n"
|
||||
+ + "Forums: http://www.spigotmc.org/forum/\n";
|
||||
+ + "IRC: #spigot @ irc.spi.gt ( http://www.spigotmc.org/pages/irc/ )\n"
|
||||
+ + "Forums: http://www.spigotmc.org/\n";
|
||||
+ /*========================================================================*/
|
||||
+ static YamlConfiguration config;
|
||||
+ static int version;
|
||||
|
@@ -1,50 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <git@md-5.net>
|
||||
Date: Sun, 10 Aug 2014 11:01:02 +1000
|
||||
Subject: [PATCH] Force Close Inventory On Move
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketPlayInListener {
|
||||
|
||||
public void a(PacketPlayInBlockDig packetplayinblockdig) {
|
||||
if (this.player.dead) return; // CraftBukkit
|
||||
+ // Spigot start
|
||||
+ if ( player.activeContainer != player.defaultContainer )
|
||||
+ {
|
||||
+ getPlayer().closeInventory();
|
||||
+ }
|
||||
+ // Spigot end
|
||||
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
|
||||
|
||||
this.player.v();
|
||||
@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketPlayInListener {
|
||||
// a notch bug where the item doesn't update correctly.
|
||||
boolean always = false;
|
||||
// CraftBukkit end
|
||||
+ // Spigot start
|
||||
+ if ( player.activeContainer != player.defaultContainer )
|
||||
+ {
|
||||
+ getPlayer().closeInventory();
|
||||
+ }
|
||||
+ // Spigot end
|
||||
|
||||
ItemStack itemstack = this.player.inventory.getItemInHand();
|
||||
boolean flag = false;
|
||||
@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketPlayInListener {
|
||||
return;
|
||||
}
|
||||
// Spigot End
|
||||
+ // Spigot start
|
||||
+ if ( player.activeContainer != player.defaultContainer )
|
||||
+ {
|
||||
+ getPlayer().closeInventory();
|
||||
+ }
|
||||
+ // Spigot end
|
||||
|
||||
this.player.v();
|
||||
if (entity != null) {
|
||||
--
|
@@ -0,0 +1,53 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 20 Aug 2014 18:12:32 -0400
|
||||
Subject: [PATCH] Limit TNT Detonations per tick
|
||||
|
||||
This gives a per-world control on how much TNT will be processed per-tick,
|
||||
preventing a massive TNT detonation from lagging out the server.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
|
||||
@@ -0,0 +0,0 @@ public class EntityTNTPrimed extends Entity {
|
||||
}
|
||||
|
||||
public void h() {
|
||||
+ if (world.spigotConfig.currentPrimedTnt++ > world.spigotConfig.maxTntTicksPerTick) { return; } // Spigot
|
||||
this.lastX = this.locX;
|
||||
this.lastY = this.locY;
|
||||
this.lastZ = this.locZ;
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 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 {
|
||||
}
|
||||
|
||||
super.tickEntities();
|
||||
+ spigotConfig.currentPrimedTnt = 0; // Spigot
|
||||
}
|
||||
|
||||
public void i() {
|
||||
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
||||
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
||||
@@ -0,0 +0,0 @@ public class SpigotWorldConfig
|
||||
combatExhaustion = (float) getDouble( "hunger.combat-exhaustion", 0.3 );
|
||||
regenExhaustion = (float) getDouble( "hunger.regen-exhaustion", 3 );
|
||||
}
|
||||
+
|
||||
+ public int currentPrimedTnt = 0;
|
||||
+ public int maxTntTicksPerTick;
|
||||
+ private void maxTntPerTick() {
|
||||
+ if ( SpigotConfig.version < 7 )
|
||||
+ {
|
||||
+ set( "max-tnt-per-tick", 100 );
|
||||
+ }
|
||||
+ maxTntTicksPerTick = getInt( "max-tnt-per-tick", 100 );
|
||||
+ log( "Max TNT Explosions: " + maxTntTicksPerTick );
|
||||
+ }
|
||||
}
|
||||
--
|
Reference in New Issue
Block a user