19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
24 lines
868 B
Diff
24 lines
868 B
Diff
From 173a71adcf42c8dc373c9a2399eb4a0410915efc Mon Sep 17 00:00:00 2001
|
|
From: md_5 <md_5@live.com.au>
|
|
Date: Sun, 19 May 2013 18:29:48 +1000
|
|
Subject: [PATCH] Remove -o Option
|
|
|
|
Serves no purpose other than to confuse users.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PropertyManager.java b/src/main/java/net/minecraft/server/PropertyManager.java
|
|
index 00b35a1..622d6e0 100644
|
|
--- a/src/main/java/net/minecraft/server/PropertyManager.java
|
|
+++ b/src/main/java/net/minecraft/server/PropertyManager.java
|
|
@@ -53,7 +53,7 @@ public class PropertyManager {
|
|
}
|
|
|
|
private <T> T getOverride(String name, T value) {
|
|
- if ((this.options != null) && (this.options.has(name))) {
|
|
+ if ((this.options != null) && (this.options.has(name)) && !name.equals( "online-mode")) { // Spigot
|
|
return (T) this.options.valueOf(name);
|
|
}
|
|
|
|
--
|
|
2.1.0
|
|
|