SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up some of our patches

Browse Source 
Remove unused torch placement config option
Remove ambiguity in invisible players patch
This commit is contained in:
Zach Brown
2014-12-05 22:28:08 -06:00
parent 77ef1b5cc7
commit b889c27630
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/Configurable-TNT-water-movement.patch
View File

@@ -26,8 +26,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig @@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig
{
boatsDropBoats = getBoolean( "game-mechanics.boats-drop-boats", false ); boatsDropBoats = getBoolean( "game-mechanics.boats-drop-boats", false );
lessPickyTorches = getBoolean( "game-mechanics.less-picky-torch-placement", false );
} }
+ +
+ public boolean tntMovesInWater; + public boolean tntMovesInWater;
@@ -36,6 +36,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ tntMovesInWater = getBoolean("tnt-moves-in-water", true ); + tntMovesInWater = getBoolean("tnt-moves-in-water", true );
+ } + }
} }
-- --
1.9.4.msysgit.2

2
Spigot-Server-Patches/Configurable-game-mechanics-changes.patch
View File

@@ -72,11 +72,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
+ +
+ public boolean boatsDropBoats; + public boolean boatsDropBoats;
+ public boolean lessPickyTorches;
+ private void mechanicsChanges() + private void mechanicsChanges()
+ { + {
+ boatsDropBoats = getBoolean( "game-mechanics.boats-drop-boats", false ); + boatsDropBoats = getBoolean( "game-mechanics.boats-drop-boats", false );
+ lessPickyTorches = getBoolean( "game-mechanics.less-picky-torch-placement", false );
+ } + }
} }
-- --

8
Spigot-Server-Patches/Invisible-players-don-t-have-rights.patch → Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com> From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Fri, 28 Nov 2014 00:35:56 -0600 Date: Fri, 28 Nov 2014 00:35:56 -0600
Subject: [PATCH] Invisible players don't have rights Subject: [PATCH] Vanished players don't have rights
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -12,7 +12,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
float f3; float f3;
float f4; float f4;
+ // PaperSpigot start - Allow arrows to fly through players + // PaperSpigot start - Allow arrows to fly through vanished players the shooter can't see
+ if (movingobjectposition != null && movingobjectposition.entity instanceof EntityPlayer && shooter != null && shooter instanceof EntityPlayer) { + if (movingobjectposition != null && movingobjectposition.entity instanceof EntityPlayer && shooter != null && shooter instanceof EntityPlayer) {
+ if (!((EntityPlayer) shooter).getBukkitEntity().canSee(((EntityPlayer) movingobjectposition.entity).getBukkitEntity())) { + if (!((EntityPlayer) shooter).getBukkitEntity().canSee(((EntityPlayer) movingobjectposition.entity).getBukkitEntity())) {
+ movingobjectposition = null; + movingobjectposition = null;
@@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
} }
+ // PaperSpigot start - Allow projectiles to fly through players the shooter can't see + // PaperSpigot start - Allow projectiles to fly through vanished players the shooter can't see
+ if (movingobjectposition != null && movingobjectposition.entity instanceof EntityPlayer && shooter != null && shooter instanceof EntityPlayer) { + if (movingobjectposition != null && movingobjectposition.entity instanceof EntityPlayer && shooter != null && shooter instanceof EntityPlayer) {
+ if (!((EntityPlayer) shooter).getBukkitEntity().canSee(((EntityPlayer) movingobjectposition.entity).getBukkitEntity())) { + if (!((EntityPlayer) shooter).getBukkitEntity().canSee(((EntityPlayer) movingobjectposition.entity).getBukkitEntity())) {
+ movingobjectposition = null; + movingobjectposition = null;
@@ -50,7 +50,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
for (int i = 0; i < list.size(); ++i) { for (int i = 0; i < list.size(); ++i) {
Entity entity1 = (Entity) list.get(i); Entity entity1 = (Entity) list.get(i);
+ // PaperSpigot start - Allow block placement if the placer cannot see the blocker + // PaperSpigot start - Allow block placement if the placer cannot see the vanished blocker
+ if (entity instanceof EntityPlayer && entity1 instanceof EntityPlayer) { + if (entity instanceof EntityPlayer && entity1 instanceof EntityPlayer) {
+ if (!((EntityPlayer) entity).getBukkitEntity().canSee(((EntityPlayer) entity1).getBukkitEntity())) { + if (!((EntityPlayer) entity).getBukkitEntity().canSee(((EntityPlayer) entity1).getBukkitEntity())) {
+ continue; + continue;