Fixed bug with ConfigManager not saving properly

boxbeam · Jun 4, 2020 · e1289c6 · e1289c6
1 parent 711848c
commit e1289c6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/redempt/redlib/configmanager/ConfigManager.java b/src/redempt/redlib/configmanager/ConfigManager.java
@@ -199,7 +199,7 @@ public ConfigManager save() {
 		if (!registered) {
 			throw new IllegalStateException("Config manager is not registered");
 		}
-		fields.forEach(f -> f.load(data, config));
+		fields.forEach(f -> f.save(data, config));
 		try {
 			config.save(file);
 		} catch (IOException e) {

diff --git a/src/redempt/redlib/region/ProtectionPolicy.java b/src/redempt/redlib/region/ProtectionPolicy.java
@@ -212,19 +212,21 @@ public void onInteract(PlayerInteractEvent e) {
 
 	@EventHandler
 	public void onBucketEmpty(PlayerBucketEmptyEvent e) {
+		Block block = e.getBlockClicked().getRelative(e.getBlockFace());
 		if (protections.contains(ProtectionType.USE_BUCKETS)
-				&& protectionCheck.test(e.getBlockClicked())
-				&& !canBypass(e.getPlayer(), ProtectionType.USE_BUCKETS, e.getBlockClicked())) {
+				&& protectionCheck.test(block)
+				&& !canBypass(e.getPlayer(), ProtectionType.USE_BUCKETS, block)) {
 			e.setCancelled(true);
 			sendMessage(e.getPlayer(), ProtectionType.USE_BUCKETS);
 		}
 	}
 
 	@EventHandler
 	public void onBucketFill(PlayerBucketFillEvent e) {
+		Block block = e.getBlockClicked().getRelative(e.getBlockFace());
 		if (protections.contains(ProtectionType.USE_BUCKETS)
-				&& protectionCheck.test(e.getBlockClicked())
-				&& !canBypass(e.getPlayer(), ProtectionType.USE_BUCKETS, e.getBlockClicked())) {
+				&& protectionCheck.test(block)
+				&& !canBypass(e.getPlayer(), ProtectionType.USE_BUCKETS, block)) {
 			e.setCancelled(true);
 			sendMessage(e.getPlayer(), ProtectionType.USE_BUCKETS);
 		}
@@ -287,6 +289,9 @@ public void onEntityChangeBlock(EntityChangeBlockEvent e) {
 				return;
 			}
 			e.setCancelled(true);
+		} else if (e.getEntityType() == EntityType.SILVERFISH && protectionCheck.test(e.getBlock()) && protections.contains(ProtectionType.SILVERFISH)
+				&& !canBypass(null, ProtectionType.SILVERFISH, e.getBlock())) {
+			e.setCancelled(true);
 		}
 	}
 
@@ -414,7 +419,11 @@ public static enum ProtectionType {
 		/**
 		 * Mobs spawning
 		 */
-		MOB_SPAWN;
+		MOB_SPAWN,
+		/**
+		 * Silverfish infesting or breaking blocks
+		 */
+		SILVERFISH;
 
 		/**
 		 * Every protection type