OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-02 04:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge tweaks

Browse source
This commit is contained in:
md_5 2013-06-20 18:41:59 +10:00
parent df45aed819
commit 9c9a514b77
3 changed files with 89 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
CraftBukkit-Patches/0009-Proxy-IP-Filter.patch
View file

@ -1,87 +1,86 @@
From e5f922057b09dca486eb700c38c9cf890ac4849e Mon Sep 17 00:00:00 2001 From 6a5eaf4b83d8b0603b9088518922f4f19ac9f053 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Tue, 23 Apr 2013 11:22:07 +1000 Date: Tue, 23 Apr 2013 11:22:07 +1000
Subject: [PATCH] Proxy IP Filter Subject: [PATCH] Proxy IP Filter
diff --git a/src/main/java/net/minecraft/server/ThreadLoginVerifier.java b/src/main/java/net/minecraft/server/ThreadLoginVerifier.java diff --git a/src/main/java/net/minecraft/server/ThreadLoginVerifier.java b/src/main/java/net/minecraft/server/ThreadLoginVerifier.java
index 0686ba0..fcd4136 100644 index 0686ba0..1254e63 100644
--- a/src/main/java/net/minecraft/server/ThreadLoginVerifier.java --- a/src/main/java/net/minecraft/server/ThreadLoginVerifier.java
+++ b/src/main/java/net/minecraft/server/ThreadLoginVerifier.java +++ b/src/main/java/net/minecraft/server/ThreadLoginVerifier.java
@@ -28,6 +28,7 @@ class ThreadLoginVerifier extends Thread { @@ -28,6 +28,7 @@ class ThreadLoginVerifier extends Thread {
public void run() { public void run() {
try { try {
+ if (org.bukkit.craftbukkit.Spigot.filterIp(pendingConnection)) return; // Spigot + if (org.spigotmc.SpamHaus.filterIp(pendingConnection)) return; // Spigot
String s = (new BigInteger(MinecraftEncryption.a(PendingConnection.a(this.pendingConnection), PendingConnection.b(this.pendingConnection).F().getPublic(), PendingConnection.c(this.pendingConnection)))).toString(16); String s = (new BigInteger(MinecraftEncryption.a(PendingConnection.a(this.pendingConnection), PendingConnection.b(this.pendingConnection).F().getPublic(), PendingConnection.c(this.pendingConnection)))).toString(16);
URL url = new URL("http://session.minecraft.net/game/checkserver.jsp?user=" + URLEncoder.encode(PendingConnection.d(this.pendingConnection), "UTF-8") + "&serverId=" + URLEncoder.encode(s, "UTF-8")); URL url = new URL("http://session.minecraft.net/game/checkserver.jsp?user=" + URLEncoder.encode(PendingConnection.d(this.pendingConnection), "UTF-8") + "&serverId=" + URLEncoder.encode(s, "UTF-8"));
BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(url.openStream())); BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(url.openStream()));
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java diff --git a/src/main/java/org/spigotmc/SpamHaus.java b/src/main/java/org/spigotmc/SpamHaus.java
index 2cd806e..fd90979 100644 new file mode 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java index 0000000..55d8d12
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java --- /dev/null
@@ -1,19 +1,49 @@ +++ b/src/main/java/org/spigotmc/SpamHaus.java
package org.bukkit.craftbukkit; @@ -0,0 +1,44 @@
+package org.spigotmc;
+
+import java.net.InetAddress; +import java.net.InetAddress;
+import net.minecraft.server.PendingConnection; +import net.minecraft.server.PendingConnection;
import org.bukkit.command.SimpleCommandMap;
import org.bukkit.configuration.file.YamlConfiguration;
public class Spigot {
+ private static boolean filterIps;
+ +
public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) { +public class SpamHaus
server.whitelistMessage = configuration.getString("settings.whitelist-message", server.whitelistMessage); +{
server.stopMessage = configuration.getString("settings.stop-message", server.stopMessage);
server.logCommands = configuration.getBoolean("settings.log-commands", true);
server.commandComplete = configuration.getBoolean("settings.command-complete", true);
server.spamGuardExclusions = configuration.getStringList("settings.spam-exclusions");
+ filterIps = configuration.getBoolean("settings.filter-unsafe-ips", false);
if (server.chunkGCPeriod == 0) {
server.getLogger().severe("[Spigot] You should not disable chunk-gc, unexpected behaviour may occur!");
}
}
+ +
+ public static boolean filterIp(PendingConnection con) { + private SpamHaus()
+ if (filterIps) { + {
+ try { + }
+
+ public static boolean filterIp(PendingConnection con)
+ {
+ if ( SpigotConfig.preventProxies )
+ {
+ try
+ {
+ InetAddress address = con.getSocket().getInetAddress(); + InetAddress address = con.getSocket().getInetAddress();
+ String ip = address.getHostAddress(); + String ip = address.getHostAddress();
+ +
+ if (!address.isLoopbackAddress()) { + if ( !address.isLoopbackAddress() )
+ String[] split = ip.split("\\."); + {
+ String[] split = ip.split( "\\." );
+ StringBuilder lookup = new StringBuilder(); + StringBuilder lookup = new StringBuilder();
+ for (int i = split.length - 1; i >= 0; i--) { + for ( int i = split.length - 1; i >= 0; i-- )
+ lookup.append(split[i]); + {
+ lookup.append("."); + lookup.append( split[i] );
+ lookup.append( "." );
+ } + }
+ lookup.append("xbl.spamhaus.org."); + lookup.append( "xbl.spamhaus.org." );
+ if (InetAddress.getByName(lookup.toString()) != null) { + if ( InetAddress.getByName( lookup.toString() ) != null )
+ con.disconnect("Your IP address (" + ip + ") is flagged as unsafe by spamhaus.org/xbl"); + {
+ con.disconnect( "Your IP address (" + ip + ") is flagged as unsafe by spamhaus.org/xbl" );
+ return true; + return true;
+ } + }
+ } + }
+ } catch (Exception ex) { + } catch ( Exception ex )
+ {
+ } + }
+ } + }
+ return false; + return false;
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 38bd7ba..d647943 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -100,4 +100,10 @@ public class SpigotConfig
{
logCommands = getBoolean( "commands.log", logCommands );
}
+
+ public static boolean preventProxies = false;
+ private static void preventProxies()
+ {
+ preventProxies = getBoolean( "settings.prevent-proxies", preventProxies );
+ } + }
} }
diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
index 67c6c5e..b445808 100644
--- a/src/main/resources/configurations/bukkit.yml
+++ b/src/main/resources/configurations/bukkit.yml
@@ -30,6 +30,7 @@ settings:
command-complete: true
spam-exclusions:
- /skill
+ filter-unsafe-ips: false
world-settings:
default:
growth-chunks-per-tick: 650
-- --
1.8.1.2 1.8.1.2

89
CraftBukkit-Patches/0010-Merge-tweaks-and-configuration.patch
View file

@ -1,4 +1,4 @@
From 7822f8ff9ad9fc4ef9b4a9a3e3e105107de2f4a0 Mon Sep 17 00:00:00 2001 From 09bfa8a119a405550b9519bd84f11e3ae0f70f6b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:46:33 +1100 Date: Sat, 23 Mar 2013 09:46:33 +1100
Subject: [PATCH] Merge tweaks and configuration Subject: [PATCH] Merge tweaks and configuration
@ -6,7 +6,7 @@ Subject: [PATCH] Merge tweaks and configuration
This allows the merging of Experience orbs, as well as the configuration of the merge radius of items. Additionally it refactors the merge algorithm to be a better experience for players. This allows the merging of Experience orbs, as well as the configuration of the merge radius of items. Additionally it refactors the merge algorithm to be a better experience for players.
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 0225f53..294ab8f 100644 index 0225f53..67567fa 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
@@ -114,7 +114,10 @@ public class EntityItem extends Entity { @@ -114,7 +114,10 @@ public class EntityItem extends Entity {
@ -15,7 +15,7 @@ index 0225f53..294ab8f 100644
private void g() { private void g() {
- Iterator iterator = this.world.a(EntityItem.class, this.boundingBox.grow(0.5D, 0.0D, 0.5D)).iterator(); - Iterator iterator = this.world.a(EntityItem.class, this.boundingBox.grow(0.5D, 0.0D, 0.5D)).iterator();
+ // Spigot start + // Spigot start
+ double radius = world.getWorld().itemMergeRadius; + float radius = world.spigotConfig.itemMerge;
+ Iterator iterator = this.world.a(EntityItem.class, this.boundingBox.grow(radius, radius, radius)).iterator(); + Iterator iterator = this.world.a(EntityItem.class, this.boundingBox.grow(radius, radius, radius)).iterator();
+ // Spigot end + // Spigot end
@ -41,17 +41,17 @@ index 0225f53..294ab8f 100644
} }
} else { } else {
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 dcad74f..a0c61a1 100644 index afe3e4d..d7e5301 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
@@ -955,6 +955,23 @@ public abstract class World implements IBlockAccess { @@ -957,6 +957,23 @@ public abstract class World implements IBlockAccess {
// Not all projectiles extend EntityProjectile, so check for Bukkit interface instead // Not all projectiles extend EntityProjectile, so check for Bukkit interface instead
event = CraftEventFactory.callProjectileLaunchEvent(entity); event = CraftEventFactory.callProjectileLaunchEvent(entity);
} }
+ // Spigot start + // Spigot start
+ else if (entity instanceof EntityExperienceOrb) { + else if (entity instanceof EntityExperienceOrb) {
+ EntityExperienceOrb xp = (EntityExperienceOrb) entity; + EntityExperienceOrb xp = (EntityExperienceOrb) entity;
+ double radius = this.getWorld().expMergeRadius; + float radius = spigotConfig.expMerge;
+ if (radius > 0) { + if (radius > 0) {
+ List<Entity> entities = this.getEntities(entity, entity.boundingBox.grow(radius, radius, radius)); + List<Entity> entities = this.getEntities(entity, entity.boundingBox.grow(radius, radius, radius));
+ for (Entity e : entities) { + for (Entity e : entities) {
@ -68,60 +68,29 @@ index dcad74f..a0c61a1 100644
if (event != null && (event.isCancelled() || entity.dead)) { if (event != null && (event.isCancelled() || entity.dead)) {
entity.dead = true; entity.dead = true;
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/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 9789ba4..d0e6d6f 100644 index 18278c6..4c16ed7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -80,6 +80,9 @@ public class CraftWorld implements World { @@ -114,4 +114,18 @@ public class SpigotWorldConfig
public int sugarGrowthModifier = 100; wheatModifier = getInt( "growth.wheat-modifier", wheatModifier );
public int treeGrowthModifier = 100; log( "Cactus Growth Modifier: " + cactusModifier + "%" );
public int mushroomGrowthModifier = 100; }
+ // Merge radius: +
+ public double itemMergeRadius = 3.5; + public float itemMerge = 2.5F;
+ public double expMergeRadius = 3.5; + private void itemMerge()
// Spigot end + {
+ itemMerge = getFloat( "merge-radius.item", itemMerge );
// Spigot start + log( "Item Merge Radius: " + itemMerge );
@@ -114,6 +117,8 @@ public class CraftWorld implements World { + }
sugarGrowthModifier = configuration.getInt( "world-settings.default.sugar-growth-modifier", sugarGrowthModifier ); +
treeGrowthModifier = configuration.getInt( "world-settings.default.tree-growth-modifier", treeGrowthModifier ); + public float expMerge = 3.0F;
mushroomGrowthModifier = configuration.getInt( "world-settings.default.mushroom-growth-modifier", mushroomGrowthModifier ); + private void expMerge()
+ itemMergeRadius = configuration.getDouble("world-settings.default.item-merge-radius", itemMergeRadius); + {
+ expMergeRadius = configuration.getDouble("world-settings.default.exp-merge-radius", expMergeRadius); + expMerge = getFloat( "merge-radius.exp", expMerge );
+ log( "Experience Merge Radius: " + expMerge );
// Override defaults with world specific, if they exist + }
info = configuration.getBoolean( "world-settings." + name + ".info", info ); }
@@ -128,6 +133,8 @@ public class CraftWorld implements World {
sugarGrowthModifier = configuration.getInt( "world-settings." + name + ".sugar-growth-modifier", sugarGrowthModifier );
treeGrowthModifier = configuration.getInt( "world-settings." + name + ".tree-growth-modifier", treeGrowthModifier );
mushroomGrowthModifier = configuration.getInt( "world-settings." + name + ".mushroom-growth-modifier", mushroomGrowthModifier );
+ itemMergeRadius = configuration.getDouble("world-settings." + name + ".item-merge-radius", itemMergeRadius);
+ expMergeRadius = configuration.getDouble("world-settings." + name + ".exp-merge-radius", expMergeRadius);
if ( info )
{
@@ -144,6 +151,8 @@ public class CraftWorld implements World {
server.getLogger().info( "Sugar Growth Modifier: " + sugarGrowthModifier );
server.getLogger().info( "Tree Growth Modifier: " + treeGrowthModifier );
server.getLogger().info( "Mushroom Growth Modifier: " + mushroomGrowthModifier );
+ server.getLogger().info( "Item Merge Radius: " + itemMergeRadius );
+ server.getLogger().info( "Exp Merge Radius: " + expMergeRadius );
server.getLogger().info( "-------------------------------------------------" );
}
// Spigot end
diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
index b445808..56873b6 100644
--- a/src/main/resources/configurations/bukkit.yml
+++ b/src/main/resources/configurations/bukkit.yml
@@ -37,6 +37,8 @@ world-settings:
mob-spawn-range: 4
random-light-updates: false
aggregate-chunkticks: 4
+ item-merge-radius: 3.5
+ exp-merge-radius: 3.5
wheat-growth-modifier: 100
cactus-growth-modifier: 100
melon-growth-modifier: 100
-- --
1.8.1.2 1.8.1.2

18
CraftBukkit-Patches/0012-Async-Operation-Catching.patch
View file

@ -1,4 +1,4 @@
From 10ca32f973eaccc4eab615b966b195c90555c916 Mon Sep 17 00:00:00 2001 From a8c529d46c95e00dc30e16fec26a5af608e2db78 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Thu, 7 Mar 2013 20:12:46 +1100 Date: Thu, 7 Mar 2013 20:12:46 +1100
Subject: [PATCH] Async Operation Catching Subject: [PATCH] Async Operation Catching
@ -46,10 +46,10 @@ index 5c03732..5f3c780 100644
this.trackedPlayers.remove(entityplayer); this.trackedPlayers.remove(entityplayer);
entityplayer.removeQueue.add(Integer.valueOf(this.tracker.id)); entityplayer.removeQueue.add(Integer.valueOf(this.tracker.id));
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 a0c61a1..1afc717 100644 index d7e5301..e353caa 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
@@ -924,6 +924,7 @@ public abstract class World implements IBlockAccess { @@ -926,6 +926,7 @@ public abstract class World implements IBlockAccess {
} }
public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason
@ -57,7 +57,7 @@ index a0c61a1..1afc717 100644
if (entity == null) return false; if (entity == null) return false;
// CraftBukkit end // CraftBukkit end
@@ -1030,6 +1031,7 @@ public abstract class World implements IBlockAccess { @@ -1032,6 +1033,7 @@ public abstract class World implements IBlockAccess {
} }
public void removeEntity(Entity entity) { public void removeEntity(Entity entity) {
@ -65,7 +65,7 @@ index a0c61a1..1afc717 100644
entity.die(); entity.die();
if (entity instanceof EntityHuman) { if (entity instanceof EntityHuman) {
this.players.remove(entity); this.players.remove(entity);
@@ -2447,6 +2449,7 @@ public abstract class World implements IBlockAccess { @@ -2449,6 +2451,7 @@ public abstract class World implements IBlockAccess {
} }
public void a(List list) { public void a(List list) {
@ -74,10 +74,10 @@ index a0c61a1..1afc717 100644
Entity entity = null; Entity entity = null;
for (int i = 0; i < list.size(); ++i) { for (int i = 0; i < list.size(); ++i) {
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 d0e6d6f..d49393d 100644 index c0fb528..edc59b1 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
@@ -239,6 +239,7 @@ public class CraftWorld implements World { @@ -160,6 +160,7 @@ public class CraftWorld implements World {
} }
public boolean unloadChunkRequest(int x, int z, boolean safe) { public boolean unloadChunkRequest(int x, int z, boolean safe) {
@ -85,7 +85,7 @@ index d0e6d6f..d49393d 100644
if (safe && isChunkInUse(x, z)) { if (safe && isChunkInUse(x, z)) {
return false; return false;
} }
@@ -249,6 +250,7 @@ public class CraftWorld implements World { @@ -170,6 +171,7 @@ public class CraftWorld implements World {
} }
public boolean unloadChunk(int x, int z, boolean save, boolean safe) { public boolean unloadChunk(int x, int z, boolean save, boolean safe) {
@ -93,7 +93,7 @@ index d0e6d6f..d49393d 100644
if (safe && isChunkInUse(x, z)) { if (safe && isChunkInUse(x, z)) {
return false; return false;
} }
@@ -316,6 +318,7 @@ public class CraftWorld implements World { @@ -237,6 +239,7 @@ public class CraftWorld implements World {
} }
public boolean loadChunk(int x, int z, boolean generate) { public boolean loadChunk(int x, int z, boolean generate) {