mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-09 17:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

bandaid-fix cartographer crash until Paper adds StructureLocateEvent

Browse Source
This commit is contained in:
dfsek
2020-10-24 23:13:51 -07:00
parent b2468234fb
commit 85ae0344a1
6 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/dfsek/terra/EventListener.java
View File

@@ -6,10 +6,13 @@ import com.dfsek.terra.util.StructureTypeEnum;
import org.bukkit.entity.EnderSignal;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Villager;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntitySpawnEvent;
import org.bukkit.event.entity.VillagerAcquireTradeEvent;
import org.bukkit.event.entity.VillagerCareerChangeEvent;
import org.polydev.gaea.GaeaPlugin;
public class EventListener implements Listener {
@@ -36,4 +39,15 @@ public class EventListener implements Listener {
} else main.getLogger().warning("No overrides are defined for Strongholds. Ender Signals will not work correctly.");
}
}
@EventHandler
public void onCartographerChange(VillagerAcquireTradeEvent e) {
if(((Villager) e.getEntity()).getProfession().equals(Villager.Profession.CARTOGRAPHER)) e.setCancelled(true); // Cancel leveling if the villager is a Cartographer, to prevent crashing server.
}
@EventHandler
public void onCartographerLevel(VillagerCareerChangeEvent e) {
if(e.getProfession().equals(Villager.Profession.CARTOGRAPHER)) {
e.getEntity().setProfession(Villager.Profession.NITWIT); // Give villager new profession to prevent server crash.
e.setCancelled(true);
}
}
}

2
src/main/java/com/dfsek/terra/config/base/ConfigPack.java
View File

@@ -193,7 +193,7 @@ public class ConfigPack extends YamlConfiguration {
try {
config = new ConfigPack(folder.toFile());
if(configs.containsKey(config.getID())) {
Bukkit.getLogger().severe("Duplicate Config Pack ID: \"" + config.getID() + "\"");
//Bukkit.getLogger().severe("Duplicate Config Pack ID: \"" + config.getID() + "\"");
continue;
}
configs.put(config.getID(), config);