mirror of
https://github.com/PaperMC/Paper.git
synced 2025-03-20 22:18:58 +01:00
Remove no longer needed undead horse leash patch
This is now default vanilla behavior Fixes #3644
This commit is contained in:
parent
5e9cc3a228
commit
b6925c36af
462 changed files with 117 additions and 169 deletions
Spigot-Server-Patches
0063-Handle-Item-Meta-Inconsistencies.patch0063-Undead-horse-leashing.patch0064-Configurable-Non-Player-Arrow-Despawn-Rate.patch0065-Add-World-Util-Methods.patch0066-Custom-replacement-for-eaten-items.patch0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch0068-Waving-banner-workaround.patch0069-Use-a-Shared-Random-for-Entities.patch0070-Configurable-spawn-chances-for-skeleton-horses.patch0071-Optimize-isValidLocation-getType-and-getBlockData-fo.patch0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch0073-Entity-AddTo-RemoveFrom-World-Events.patch0074-Configurable-Chunk-Inhabited-Time.patch0075-EntityPathfindEvent.patch0076-Sanitise-RegionFileCache-and-make-configurable.patch0077-Do-not-load-chunks-for-Pathfinding.patch0078-Add-PlayerUseUnknownEntityEvent.patch0079-Fix-reducedDebugInfo-not-initialized-on-client.patch0080-Configurable-Grass-Spread-Tick-Rate.patch0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch0082-Remove-Debug-checks-from-DataBits.patch0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch0084-Workaround-for-setting-passengers-on-players.patch0085-Remove-unused-World-Tile-Entity-List.patch0086-Don-t-tick-Skulls-unused-code.patch0087-Configurable-Player-Collision.patch0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch0089-Configurable-RCON-IP-address.patch0090-Prevent-Fire-from-loading-chunks.patch0091-Implement-PlayerLocaleChangeEvent.patch0092-EntityRegainHealthEvent-isFastRegen-API.patch0093-Add-ability-to-configure-frosted_ice-properties.patch0094-remove-null-possibility-for-getServer-singleton.patch0095-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch0096-LootTable-API-Replenishable-Lootables-Feature.patch0097-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch0098-System-property-for-disabling-watchdoge.patch0099-Optimize-UserCache-Thread-Safe.patch0100-Avoid-blocking-on-Network-Manager-creation.patch0101-Optional-TNT-doesn-t-move-in-water.patch0102-Faster-redstone-torch-rapid-clock-removal.patch0103-Add-server-name-parameter.patch0104-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch0105-Fix-Double-World-Add-issues.patch0106-Fix-Old-Sign-Conversion.patch0107-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch0108-Add-setting-for-proxy-online-mode-status.patch0109-Optimise-BlockState-s-hashCode-equals.patch0110-Configurable-packet-in-spam-threshold.patch0111-Configurable-flying-kick-messages.patch0112-Chunk-registration-fixes.patch0113-Remove-FishingHook-reference-on-Craft-Entity-removal.patch0114-Auto-fix-bad-Y-levels-on-player-login.patch0115-Option-to-remove-corrupt-tile-entities.patch0116-Add-EntityZapEvent.patch0117-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch0118-Cache-user-authenticator-threads.patch0119-Optimise-removeQueue.patch0120-Allow-Reloading-of-Command-Aliases.patch0121-Add-source-to-PlayerExpChangeEvent.patch0122-Don-t-let-fishinghooks-use-portals.patch0123-Add-ProjectileCollideEvent.patch0124-Prevent-Pathfinding-out-of-World-Border.patch0125-Optimize-World.isLoaded-BlockPosition-Z.patch0126-Bound-Treasure-Maps-to-World-Border.patch0127-Configurable-Cartographer-Treasure-Maps.patch0128-Optimize-ItemStack.isEmpty.patch0129-Add-API-methods-to-control-if-armour-stands-can-move.patch0130-Properly-fix-item-duplication-bug.patch0131-String-based-Action-Bar-API.patch0132-Firework-API-s.patch0133-PlayerTeleportEndGatewayEvent.patch0134-Provide-E-TE-Chunk-count-stat-methods.patch0135-Enforce-Sync-Player-Saves.patch0136-Don-t-allow-entities-to-ride-themselves-572.patch0137-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch0138-Cap-Entity-Collisions.patch0139-Remove-CraftScheduler-Async-Task-Debugger.patch0140-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch0141-Do-not-let-armorstands-drown.patch0142-Properly-handle-async-calls-to-restart-the-server.patch0143-Add-system-property-to-disable-book-size-limits.patch0144-Add-option-to-make-parrots-stay-on-shoulders-despite.patch0145-Add-configuration-option-to-prevent-player-names-fro.patch0146-Use-TerminalConsoleAppender-for-console-improvements.patch0147-provide-a-configurable-option-to-disable-creeper-lin.patch0148-Item-canEntityPickup.patch0149-PlayerPickupItemEvent-setFlyAtPlayer.patch0150-PlayerAttemptPickupItemEvent.patch0151-Add-UnknownCommandEvent.patch0152-Basic-PlayerProfile-API.patch0153-Shoulder-Entities-Release-API.patch0154-Profile-Lookup-Events.patch0155-Block-player-logins-during-server-shutdown.patch0156-Entity-fromMobSpawner.patch0157-Improve-the-Saddle-API-for-Horses.patch0158-Implement-ensureServerConversions-API.patch0159-Implement-getI18NDisplayName.patch0160-ProfileWhitelistVerifyEvent.patch0161-Fix-this-stupid-bullshit.patch
|
@ -1,52 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Fri, 18 Mar 2016 14:19:19 -0400
|
||||
Subject: [PATCH] Undead horse leashing
|
||||
|
||||
default false to match vanilla, but option to allow undead horse types to be leashed.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 04430aae52205ee167662004e45c145b9d2e8bed..dd21221534542d0265fa7d2178ab69c236579cf7 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -208,4 +208,9 @@ public class PaperWorldConfig {
|
||||
private void nonPlayerEntitiesOnScoreboards() {
|
||||
nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
|
||||
}
|
||||
+
|
||||
+ public boolean allowLeashingUndeadHorse = false;
|
||||
+ private void allowLeashingUndeadHorse() {
|
||||
+ allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
|
||||
index 364697e0155012c300219ad94a3995809e6c2f8f..d45d025fa74a5ff53f0828f51639e19613e30186 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
|
||||
@@ -106,6 +106,13 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
|
||||
this.bx = flag;
|
||||
}
|
||||
|
||||
+ // Paper start
|
||||
+ @Override
|
||||
+ public boolean a(EntityHuman entityhuman) {
|
||||
+ return world.paperConfig.allowLeashingUndeadHorse ? super.a(entityhuman) : super.a(entityhuman) && this.getMonsterType() != EnumMonsterType.UNDEAD; // Paper
|
||||
+ }
|
||||
+ // Paper end
|
||||
+
|
||||
@Override
|
||||
protected void t(float f) {
|
||||
if (f > 6.0F && this.fa()) {
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
index 9715f10c790c0210435622ab9997ac40f98da185..2f85d9799d67d3fb1d340179d8dbd03771467329 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
@@ -1282,7 +1282,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||
|
||||
}
|
||||
|
||||
- public boolean a(EntityHuman entityhuman) {
|
||||
+ public boolean a(EntityHuman entityhuman) { // Paper - overriden in EntityHorseAbstract
|
||||
return !this.isLeashed() && !(this instanceof IMonster);
|
||||
}
|
||||
|
|
@ -6,12 +6,12 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
|
|||
Can set a much shorter despawn rate for arrows that players can not pick up.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index dd21221534542d0265fa7d2178ab69c236579cf7..7de7b74ff69bba1cbad24623d7eeff6c79812bab 100644
|
||||
index 04430aae52205ee167662004e45c145b9d2e8bed..d8b9d87bca6eb95c2cea91e4d8466b9792582d52 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -213,4 +213,19 @@ public class PaperWorldConfig {
|
||||
private void allowLeashingUndeadHorse() {
|
||||
allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
|
||||
@@ -208,4 +208,19 @@ public class PaperWorldConfig {
|
||||
private void nonPlayerEntitiesOnScoreboards() {
|
||||
nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
|
||||
}
|
||||
+
|
||||
+ public int nonPlayerArrowDespawnRate = -1;
|
|
@ -5,10 +5,10 @@ Subject: [PATCH] Configurable spawn chances for skeleton horses
|
|||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 7de7b74ff69bba1cbad24623d7eeff6c79812bab..6ef0e1399e9ff260712db1a044068c125b1316d3 100644
|
||||
index d8b9d87bca6eb95c2cea91e4d8466b9792582d52..92d1dffbf436a21943b4a6aa0fabf54f064e6046 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -228,4 +228,12 @@ public class PaperWorldConfig {
|
||||
@@ -223,4 +223,12 @@ public class PaperWorldConfig {
|
||||
log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
|
||||
log("Creative Arrow Despawn Rate: " + creativeArrowDespawnRate);
|
||||
}
|
|
@ -11,10 +11,10 @@ For people who want all chunks to be treated equally, you can chose a fixed valu
|
|||
This allows to fine-tune vanilla gameplay.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 6ef0e1399e9ff260712db1a044068c125b1316d3..5872e6b171416686b11678ac9f65706b83b4e231 100644
|
||||
index 92d1dffbf436a21943b4a6aa0fabf54f064e6046..725958efab3dd05e04b7b18e169230762ef800d0 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -236,4 +236,14 @@ public class PaperWorldConfig {
|
||||
@@ -231,4 +231,14 @@ public class PaperWorldConfig {
|
||||
skeleHorseSpawnChance = 0.01D; // Vanilla value
|
||||
}
|
||||
}
|
|
@ -5,10 +5,10 @@ Subject: [PATCH] Configurable Grass Spread Tick Rate
|
|||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 5872e6b171416686b11678ac9f65706b83b4e231..47f5f8055ed45914309ca9a295ac48b89f192320 100644
|
||||
index 725958efab3dd05e04b7b18e169230762ef800d0..fe2c8001897dc6d66ce0d24ddb1a5d3b79810294 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -246,4 +246,10 @@ public class PaperWorldConfig {
|
||||
@@ -241,4 +241,10 @@ public class PaperWorldConfig {
|
||||
}
|
||||
fixedInhabitedTime = getInt("fixed-chunk-inhabited-time", -1);
|
||||
}
|
|
@ -12,10 +12,10 @@ for this on CB at one point but I can't find it. We may need to do this
|
|||
ourselves at some point in the future.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 47f5f8055ed45914309ca9a295ac48b89f192320..b1d1a3c1f84e0d2153de257183687502c8f393d1 100644
|
||||
index fe2c8001897dc6d66ce0d24ddb1a5d3b79810294..538e6751f3bda77ba32256158d2a6a25025b360c 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -252,4 +252,9 @@ public class PaperWorldConfig {
|
||||
@@ -247,4 +247,9 @@ public class PaperWorldConfig {
|
||||
grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate));
|
||||
log("Grass Spread Tick Rate: " + grassUpdateRate);
|
||||
}
|
|
@ -5,10 +5,10 @@ Subject: [PATCH] Add ability to configure frosted_ice properties
|
|||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index b1d1a3c1f84e0d2153de257183687502c8f393d1..9e0c4895403a264f927292db2ac06b00731986e3 100644
|
||||
index 538e6751f3bda77ba32256158d2a6a25025b360c..fd3793c55b8021b9fc61ce6be585a8c9b477aba2 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -257,4 +257,14 @@ public class PaperWorldConfig {
|
||||
@@ -252,4 +252,14 @@ public class PaperWorldConfig {
|
||||
private void useVanillaScoreboardColoring() {
|
||||
useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false);
|
||||
}
|
|
@ -11,10 +11,10 @@ This feature is good for long term worlds so that newer players
|
|||
do not suffer with "Every chest has been looted"
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 9e0c4895403a264f927292db2ac06b00731986e3..6db1312035807c04b98408100fb0a5c04c07aff4 100644
|
||||
index fd3793c55b8021b9fc61ce6be585a8c9b477aba2..05ea87a473228f5b386258fae3943f3f4561eaa6 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -267,4 +267,26 @@ public class PaperWorldConfig {
|
||||
@@ -262,4 +262,26 @@ public class PaperWorldConfig {
|
||||
this.frostedIceDelayMax = this.getInt("frosted-ice.delay.max", this.frostedIceDelayMax);
|
||||
log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax);
|
||||
}
|
|
@ -5,7 +5,7 @@ Subject: [PATCH] Optional TNT doesn't move in water
|
|||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 6db1312035807c04b98408100fb0a5c04c07aff4..8cf3076f4e0d8d7e81158881c763f89ebda7e678 100644
|
||||
index 05ea87a473228f5b386258fae3943f3f4561eaa6..ac76bdd7e1d91b0d242539c4495948cdfbb622e0 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -2,7 +2,6 @@ package com.destroystokyo.paper;
|
||||
|
@ -16,7 +16,7 @@ index 6db1312035807c04b98408100fb0a5c04c07aff4..8cf3076f4e0d8d7e81158881c763f89e
|
|||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.spigotmc.SpigotWorldConfig;
|
||||
|
||||
@@ -289,4 +288,14 @@ public class PaperWorldConfig {
|
||||
@@ -284,4 +283,14 @@ public class PaperWorldConfig {
|
||||
);
|
||||
}
|
||||
}
|
|
@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login
|
|||
Bring down to a saner Y level if super high, as this can cause the server to crash
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
index 898ac661042381b99b98991f493538c0433ddb09..69178bcfa328b79e8433805b650948fadc7b799b 100644
|
||||
index 177f865688c40d0ecca72771007e2271626ab5cc..b7f7dd59fd9deaff9ec3797b395c91c91ce5b54c 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
@@ -206,6 +206,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
@ -5,10 +5,10 @@ Subject: [PATCH] Option to remove corrupt tile entities
|
|||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 8cf3076f4e0d8d7e81158881c763f89ebda7e678..721eceeffc843da8b9da1ccc2d07f3bcc901db76 100644
|
||||
index ac76bdd7e1d91b0d242539c4495948cdfbb622e0..6cb717a63f52d757b0b323408d2fc0c3d7db77da 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -298,4 +298,9 @@ public class PaperWorldConfig {
|
||||
@@ -293,4 +293,9 @@ public class PaperWorldConfig {
|
||||
preventTntFromMovingInWater = getBoolean("prevent-tnt-from-moving-in-water", false);
|
||||
log("Prevent TNT from moving in water: " + preventTntFromMovingInWater);
|
||||
}
|
|
@ -5,7 +5,7 @@ Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
|
|||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 721eceeffc843da8b9da1ccc2d07f3bcc901db76..bff2e9d26dc8057c3950d1b57ee2e7469e7f943c 100644
|
||||
index 6cb717a63f52d757b0b323408d2fc0c3d7db77da..e43aee3757b6765d898b50ebfff1a28071638558 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -2,6 +2,7 @@ package com.destroystokyo.paper;
|
||||
|
@ -16,7 +16,7 @@ index 721eceeffc843da8b9da1ccc2d07f3bcc901db76..bff2e9d26dc8057c3950d1b57ee2e746
|
|||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.spigotmc.SpigotWorldConfig;
|
||||
|
||||
@@ -303,4 +304,12 @@ public class PaperWorldConfig {
|
||||
@@ -298,4 +299,12 @@ public class PaperWorldConfig {
|
||||
private void removeCorruptTEs() {
|
||||
removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
|
||||
}
|
|
@ -9,10 +9,10 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
|
|||
which are limited in quantity.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index bff2e9d26dc8057c3950d1b57ee2e7469e7f943c..f164844f339793860e773c499443ce160d0a6830 100644
|
||||
index e43aee3757b6765d898b50ebfff1a28071638558..255b4081314162cbe344b008158c6f4584795fb8 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -312,4 +312,14 @@ public class PaperWorldConfig {
|
||||
@@ -307,4 +307,14 @@ public class PaperWorldConfig {
|
||||
Bukkit.getLogger().warning("Spawn Egg and Armor Stand NBT filtering disabled, this is a potential security risk");
|
||||
}
|
||||
}
|
|
@ -12,10 +12,10 @@ just as it does in Vanilla, but entity pushing logic will be capped.
|
|||
You can set this to 0 to disable collisions.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index f164844f339793860e773c499443ce160d0a6830..751551f173338217f6682532a9a5e1a269415177 100644
|
||||
index 255b4081314162cbe344b008158c6f4584795fb8..04ee0856a8c62e1afb438d4fddf40e605e82a074 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -322,4 +322,10 @@ public class PaperWorldConfig {
|
||||
@@ -317,4 +317,10 @@ public class PaperWorldConfig {
|
||||
log("Treasure Maps will return already discovered locations");
|
||||
}
|
||||
}
|
|
@ -11,10 +11,10 @@ I suspect Mojang may switch to this behavior before full release.
|
|||
To be converted into a Paper-API event at some point in the future?
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 751551f173338217f6682532a9a5e1a269415177..eae1690cc6db99b2f3af70a121f83b455b0fb20d 100644
|
||||
index 04ee0856a8c62e1afb438d4fddf40e605e82a074..0cc7ad571eba249199a2e5e8ec567a874241c903 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -328,4 +328,10 @@ public class PaperWorldConfig {
|
||||
@@ -323,4 +323,10 @@ public class PaperWorldConfig {
|
||||
maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
|
||||
log( "Max Entity Collisions: " + maxCollisionsPerEntity );
|
||||
}
|
|
@ -6,10 +6,10 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
|
|||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index eae1690cc6db99b2f3af70a121f83b455b0fb20d..39ab5457569684bc66cd67f5f9d2505ef9f304ab 100644
|
||||
index 0cc7ad571eba249199a2e5e8ec567a874241c903..e30f48caf2ce4f48f371b2594b765c27bc9e9778 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -334,4 +334,10 @@ public class PaperWorldConfig {
|
||||
@@ -329,4 +329,10 @@ public class PaperWorldConfig {
|
||||
parrotsHangOnBetter = getBoolean("parrots-are-unaffected-by-player-movement", false);
|
||||
log("Parrots are unaffected by player movement: " + parrotsHangOnBetter);
|
||||
}
|
|
@ -5,7 +5,7 @@ Subject: [PATCH] Item#canEntityPickup
|
|||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
index 2f85d9799d67d3fb1d340179d8dbd03771467329..e434e23bf5b22a623ed7b915711bdb31b7e90b61 100644
|
||||
index 9715f10c790c0210435622ab9997ac40f98da185..a6aa7a1a8da787604b2d8f3f9ea119d4b6bc188d 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
@@ -539,6 +539,11 @@ public abstract class EntityInsentient extends EntityLiving {
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue